Remove unimplemented memory pool.
dlmalloc does such a great job that we don't need a pool anyways. Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
This commit is contained in:
parent
4fd15f5434
commit
585ef1e14a
@ -1,71 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef UTILS_POOL_H
|
||||
#define UTILS_POOL_H
|
||||
|
||||
#include <utils/TypeHelpers.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
class PoolImpl {
|
||||
public:
|
||||
PoolImpl(size_t objSize);
|
||||
~PoolImpl();
|
||||
|
||||
void* allocImpl();
|
||||
void freeImpl(void* obj);
|
||||
|
||||
private:
|
||||
size_t mObjSize;
|
||||
};
|
||||
|
||||
/*
|
||||
* A homogeneous typed memory pool for fixed size objects.
|
||||
* Not intended to be thread-safe.
|
||||
*/
|
||||
template<typename T>
|
||||
class Pool : private PoolImpl {
|
||||
public:
|
||||
/* Creates an initially empty pool. */
|
||||
Pool() : PoolImpl(sizeof(T)) { }
|
||||
|
||||
/* Destroys the pool.
|
||||
* Assumes that the pool is empty. */
|
||||
~Pool() { }
|
||||
|
||||
/* Allocates an object from the pool, growing the pool if needed. */
|
||||
inline T* alloc() {
|
||||
void* mem = allocImpl();
|
||||
if (! traits<T>::has_trivial_ctor) {
|
||||
return new (mem) T();
|
||||
} else {
|
||||
return static_cast<T*>(mem);
|
||||
}
|
||||
}
|
||||
|
||||
/* Frees an object from the pool. */
|
||||
inline void free(T* obj) {
|
||||
if (! traits<T>::has_trivial_dtor) {
|
||||
obj->~T();
|
||||
}
|
||||
freeImpl(obj);
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace android
|
||||
|
||||
#endif // UTILS_POOL_H
|
@ -29,7 +29,6 @@ commonSources:= \
|
||||
Flattenable.cpp \
|
||||
LinearTransform.cpp \
|
||||
ObbFile.cpp \
|
||||
Pool.cpp \
|
||||
PropertyMap.cpp \
|
||||
RefBase.cpp \
|
||||
ResourceTypes.cpp \
|
||||
|
@ -1,37 +0,0 @@
|
||||
//
|
||||
// Copyright 2010 The Android Open Source Project
|
||||
//
|
||||
// A simple memory pool.
|
||||
//
|
||||
#define LOG_TAG "Pool"
|
||||
|
||||
//#define LOG_NDEBUG 0
|
||||
|
||||
#include <cutils/log.h>
|
||||
#include <utils/Pool.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
namespace android {
|
||||
|
||||
// TODO Provide a real implementation of a pool. This is just a stub for initial development.
|
||||
|
||||
PoolImpl::PoolImpl(size_t objSize) :
|
||||
mObjSize(objSize) {
|
||||
}
|
||||
|
||||
PoolImpl::~PoolImpl() {
|
||||
}
|
||||
|
||||
void* PoolImpl::allocImpl() {
|
||||
void* ptr = malloc(mObjSize);
|
||||
LOG_ALWAYS_FATAL_IF(ptr == NULL, "Cannot allocate new pool object.");
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void PoolImpl::freeImpl(void* obj) {
|
||||
LOG_ALWAYS_FATAL_IF(obj == NULL, "Caller attempted to free NULL pool object.");
|
||||
return free(obj);
|
||||
}
|
||||
|
||||
} // namespace android
|
Loading…
Reference in New Issue
Block a user