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

Correct accounting of mapped memory

Browse Source
This commit is contained in:
hvlad 2015-02-16 13:53:03 +00:00
parent 7331474059
commit d39e1f0a9f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,8 +694,8 @@ void MemoryPool::releaseBlock(MemBlock* block) throw ()
if (&hunk->blocks == freeBlock)
{
*ptr = hunk->nextHunk;
decrement_mapping(hunk->length);
releaseRaw(pool_destroying, hunk, hunk->length);
size_t released = releaseRaw(pool_destroying, hunk, hunk->length);
decrement_mapping(released);
return;
}
}
@ -894,7 +894,7 @@ void MemoryPool::validateBigBlock(MemBigObject* block) throw ()
}
}
void MemoryPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) throw ()
size_t MemoryPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) throw ()
{
#ifndef USE_VALGRIND
if (use_cache && (size == DEFAULT_ALLOCATION))
@ -903,7 +903,7 @@ void MemoryPool::releaseRaw(bool destroying, void* block, size_t size, bool use_
if (extents_cache.getCount() < extents_cache.getCapacity())
{
extents_cache.push(block);
return;
return size;
}
}
#else
@ -930,7 +930,7 @@ void MemoryPool::releaseRaw(bool destroying, void* block, size_t size, bool use_
item->size = size;
item->handle = handle;
delayedExtentCount++;
return;
return size;
}
DelayedExtent* item = &delayedExtents[delayedExtentsPos];
@ -970,6 +970,8 @@ void MemoryPool::releaseRaw(bool destroying, void* block, size_t size, bool use_
#endif
#endif // WIN_NT
corrupt("OS memory deallocation error");
return size;
}
void MemoryPool::globalFree(void* block) throw ()

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

@ -302,7 +302,7 @@ private:
void validateFreeList(void) throw ();
void validateBigBlock(MemBigObject* block) throw ();
static void release(void* block) throw ();
static void releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
static size_t releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
#ifdef USE_VALGRIND
// Circular FIFO buffer of read/write protected blocks pending free operation