speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added block address to output of memory manager

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5833 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 77b11fddd387f0662f33c16cbd40c7e1f54c0706
Former-commit-id: e1fa40da46c1b0b727d98f7954a0d24ce9eea35f
This commit is contained in:
wdbee 2014-11-13 17:32:48 +00:00
parent 15b129c2e4
commit c3a8169944
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/simplix/src/unitmain.cpp
View file

@ -636,8 +636,6 @@ extern "C" int moduleTerminate()
free(DriverDescs);
DriverDescs = NULL;
//delete PLogSimplix;
return 0;
}
//==========================================================================*

22
src/libs/tgf/memmanager.cpp
View file

@ -217,7 +217,7 @@ void* GfMemoryManagerAlloc (size_t size, unsigned int Type, void* RetAddr)
// b: (void*) official pointer to the new data block
// Hunting memory leaks ...
#define IDTOSTOP 272737 // ID of block you are looking for
#define IDTOSTOP 343884 // ID of block you are looking for
if (ID == IDTOSTOP)
{
@ -271,7 +271,8 @@ void GfMemoryManagerFree (void *b, unsigned int type)
if (c->Type != type)
{
if (c->Mark = MM_MARKER)
fprintf(stderr,"Block address %p\n",c);
if (c->Mark == MM_MARKER)
fprintf(stderr,"operator delete called with data of wrong type\n");
else
fprintf(stderr,"operator delete wrong data\n");
@ -280,10 +281,10 @@ void GfMemoryManagerFree (void *b, unsigned int type)
{
tDSMMLinkBlock* n = c->Next;
tDSMMLinkBlock* p = c->Prev;
if (c->Mark = MM_MARKER)
if (c->Mark == MM_MARKER)
{
p->Next = n;
if (n != NULL)
if ((n != NULL) && (n->Mark == MM_MARKER))
n->Prev = p;
GlobalFree(c);
}
@ -319,7 +320,8 @@ void GfMemoryManagerAccept (void *b, unsigned int type)
if (c->Type != type)
{
if (c->Mark = MM_MARKER)
fprintf(stderr,"Block address %p\n",c);
if (c->Mark == MM_MARKER)
fprintf(stderr,"operator delete called with data of wrong type\n");
else
fprintf(stderr,"operator delete wrong data\n");
@ -328,11 +330,11 @@ void GfMemoryManagerAccept (void *b, unsigned int type)
{
tDSMMLinkBlock* n = c->Next;
tDSMMLinkBlock* p = c->Prev;
if (c->Mark = MM_MARKER)
if (c->Mark == MM_MARKER)
{
fprintf(stderr,"accept block %d\n",c->ID);
p->Next = n;
if (n != NULL)
if ((n != NULL) && (n->Mark == MM_MARKER))
n->Prev = p;
}
}
@ -414,7 +416,8 @@ void GfMemoryManagerRelease()
if (ToFree->Type == 1)
{
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d ReturnAddress: %p Type: new/delete\n",++n,ToFree->ID,ToFree->Size,ToFree->ReturnAddress);
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d ReturnAddress: %p BlockAddress: %p Type: new/delete\n",
++n,ToFree->ID,ToFree->Size,ToFree->ReturnAddress,ToFree);
LeakSizeNewTotal += ToFree->Size;
if (MaxLeakSizeNewTotal < ToFree->Size)
MaxLeakSizeNewTotal = ToFree->Size;
@ -422,7 +425,8 @@ void GfMemoryManagerRelease()
}
else
{
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d ReturnAddress: %p Type: malloc/free\n",++n,ToFree->ID,ToFree->Size,ToFree->ReturnAddress);
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d ReturnAddress: %p BlockAddress: %p Type: malloc/free\n",
++n,ToFree->ID,ToFree->Size,ToFree->ReturnAddress,ToFree);
LeakSizeMallocTotal += ToFree->Size;
if (MaxLeakSizeMallocTotal < ToFree->Size)
MaxLeakSizeMallocTotal = ToFree->Size;

2
src/libs/tgf/tgf.h
View file

@ -217,7 +217,7 @@ TGF_API void GfPoolMove(tMemoryPool* oldPool, tMemoryPool* newPool);
* New memory debug tools *
*********************************/
// To enble the hunting for memory leaks uncomment the following line
#define __DEBUG_MEMORYMANAGER__
//#define __DEBUG_MEMORYMANAGER__
#if (defined(WIN32) && defined(__DEBUG_MEMORYMANAGER__))
#define malloc _tgf_win_malloc

2
src/main/main.cpp
View file

@ -76,7 +76,7 @@ main(int argc, char *argv[])
GfMemoryManagerAllocate();
// For hunting of corrupted memory blocks comment the following line
GfMemoryManagerSetup(4); // Add 4 bytes per block
//GfMemoryManagerSetup(4); // Add 4 bytes per block
#endif
// ... WDB test