ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

enable DebugAllocation in heap.cpp when NDEBUG is not defined

Browse Source
This commit is contained in:
Joel Dice 2009-07-10 08:42:56 -06:00
parent 22852dcffa
commit 30c7107aa3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/heap.cpp
View File

@ -33,7 +33,12 @@ const bool Verbose = false;
const bool Verbose2 = false; const bool Verbose2 = false;
const bool Debug = false; const bool Debug = false;
const bool DebugFixies = false; const bool DebugFixies = false;
#ifdef NDEBUG
const bool DebugAllocation = false; const bool DebugAllocation = false;
#else
const bool DebugAllocation = true;
#endif
#define ACQUIRE(x) MutexLock MAKE_NAME(monitorLock_) (x) #define ACQUIRE(x) MutexLock MAKE_NAME(monitorLock_) (x)
@ -423,7 +428,9 @@ class Segment {
} }
void dispose() { void dispose() {
free(context, data, (footprint(capacity())) * BytesPerWord); if (data) {
free(context, data, (footprint(capacity())) * BytesPerWord);
}
data = 0; data = 0;
map = 0; map = 0;
} }
@ -1675,8 +1682,7 @@ void* tryAllocate(Context* c, unsigned size)
ACQUIRE(c->lock); ACQUIRE(c->lock);
if (DebugAllocation) { if (DebugAllocation) {
size = pad(size); size = pad(size) + 2 * BytesPerWord;
size += 2 * BytesPerWord;
} }
if (size + c->count < c->limit) { if (size + c->count < c->limit) {
@ -1699,21 +1705,21 @@ void* tryAllocate(Context* c, unsigned size)
void free(Context* c, const void* p, unsigned size) { void free(Context* c, const void* p, unsigned size) {
ACQUIRE(c->lock); ACQUIRE(c->lock);
expect(c->system, c->count >= size);
if (DebugAllocation) { if (DebugAllocation) {
memset(const_cast<void*>(p), 0xFE, size); size = pad(size) + 2 * BytesPerWord;
size = pad(size); memset(const_cast<void*>(p), 0xFE, size - (2 * BytesPerWord));
p = static_cast<const uintptr_t*>(p) - 1; p = static_cast<const uintptr_t*>(p) - 1;
expect(c->system, static_cast<const uintptr_t*>(p)[0] == 0x22377322); expect(c->system, static_cast<const uintptr_t*>(p)[0] == 0x22377322);
expect(c->system, static_cast<const uintptr_t*>(p) expect(c->system, static_cast<const uintptr_t*>(p)
[1 + (size / BytesPerWord)] == 0x22377322); [(size / BytesPerWord) - 1] == 0x22377322);
} }
expect(c->system, c->count >= size);
c->system->free(p); c->system->free(p);
c->count -= size; c->count -= size;
} }