firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 23:23:02 +01:00
Code Issues

Some hanges suggested by Claudio, also fixed compile errors

Browse Source
This commit is contained in:
alexpeshkoff 2009-11-04 11:37:10 +00:00
parent 463b0c6e6d
commit bc99c22556
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/classes/alloc.cpp
View File

@ -148,6 +148,8 @@ void MemoryPool::cleanup()
defaultMemoryManager = NULL;
default_stats_group->~MemoryStats();
default_stats_group = NULL;
cache_mutex->~Mutex();
cache_mutex = NULL;
}
MemoryPool::MemoryPool(MemoryStats& s, bool shared, int rounding, int cutoff, int minAlloc)
@ -233,7 +235,7 @@ void MemoryPool::setStatsGroup(MemoryStats& newStats) throw ()
stats->increment_usage(sav_used_memory);
}
MemBlock* MemoryPool::alloc(size_t length) throw (std::bad_alloc)
MemBlock* MemoryPool::alloc(const size_t length) throw (std::bad_alloc)
{
MutexLockGuard guard(mutex, "MemoryPool::alloc");
@ -756,7 +758,7 @@ inline size_t get_map_page_size()
void* MemoryPool::allocRaw(size_t size) throw (std::bad_alloc)
{
#ifndef USE_VALGRIND
if (size == defaultAllocation)
if (size == DEFAULT_ALLOCATION)
{
MutexLockGuard guard(*cache_mutex);
void* result = NULL;
@ -817,10 +819,6 @@ void* MemoryPool::allocRaw(size_t size) throw (std::bad_alloc)
return result;
}
void MemoryPool::debugStop(void)
{
}
void MemoryPool::validateFreeList(void) throw ()
{
size_t len = 0;
@ -865,7 +863,7 @@ void MemoryPool::validateBigBlock(MemBigObject* block) throw ()
void MemoryPool::releaseRaw(void *block, size_t size) throw ()
{
#ifndef USE_VALGRIND
if (size == defaultAllocation)
if (size == DEFAULT_ALLOCATION)
{
MutexLockGuard guard(*cache_mutex);
if (extents_cache.getCount() < extents_cache.getCapacity())

3
src/common/classes/alloc.h
View File

@ -262,7 +262,7 @@ private:
AtomicCounter used_memory, mapped_memory;
protected:
MemBlock* alloc(size_t size) throw (std::bad_alloc);
MemBlock* alloc(const size_t length) throw (std::bad_alloc);
void releaseBlock(MemBlock *block) throw ();
public:
@ -280,7 +280,6 @@ private:
void remove(MemFreeBlock* block) throw ();
void insert(MemFreeBlock* block) throw ();
void* allocRaw(size_t length) throw (std::bad_alloc);
void debugStop(void);
void validateFreeList(void) throw ();
void validateBigBlock(MemBigObject* block) throw ();
static void release(void* block) throw ();