speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Added return address of allocation to list of leaks

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

Former-commit-id: 64d3754cca9b0841fd75a6648a206b97ede1e2bc
Former-commit-id: 1010882ea23ec1f4ae476a803562af5ecc05cb9b
This commit is contained in:
wdbee 2014-11-12 22:36:13 +00:00
parent 5eae2f5a57
commit f32daa06a0
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,11 @@
#include "memmanager.h"
#ifdef __DEBUG_MEMORYMANAGER__
#include <stdio.h>
#include <intrin.h>
#pragma intrinsic(_ReturnAddress)
//
// Configuration (depending on the compiler)
//
@ -44,7 +49,12 @@ static unsigned int GfMM_Counter = 0; // Counter of memory blocks
//
void* operator new (size_t size)
{
return GfMemoryManagerAlloc(size, GF_MM_ALLOCTYPE_NEW);
#if defined(WIN32)
void* RetAddr = _ReturnAddress();
#else
void* RetAddr = _ReturnAddress();
#endif
return GfMemoryManagerAlloc(size, GF_MM_ALLOCTYPE_NEW,RetAddr);
}
//
@ -64,7 +74,12 @@ void operator delete (void *b)
void * _tgf_win_malloc(size_t size)
{
return GfMemoryManagerAlloc(size, GF_MM_ALLOCTYPE_MALLOC);
#if defined(WIN32)
void* RetAddr = _ReturnAddress();
#else
void* RetAddr = _ReturnAddress();
#endif
return GfMemoryManagerAlloc(size, GF_MM_ALLOCTYPE_MALLOC,RetAddr);
}
void _tgf_win_free(void * b)
@ -150,7 +165,7 @@ tMemoryManager* GfMemoryManager()
//
// Allocate memory
//
void* GfMemoryManagerAlloc (size_t size, unsigned int Type)
void* GfMemoryManagerAlloc (size_t size, unsigned int Type, void* RetAddr)
{
if (GfMemoryManagerRunning())
{
@ -179,6 +194,7 @@ void* GfMemoryManagerAlloc (size_t size, unsigned int Type)
c->Mark = MM_MARKER;
c->Type = Type;
c->Size = size;
c->ReturnAddress = RetAddr;
int ID = c->ID = GfMM_Counter++;
// Now we have here
@ -197,11 +213,11 @@ void* GfMemoryManagerAlloc (size_t size, unsigned int Type)
// b: (void*) official pointer to the new data block
// Hunting memory leaks ...
#define IDTOSTOP 56 // ID of block you are looking for
#define IDTOSTOP 6486 // ID of block you are looking for
if (ID == IDTOSTOP)
{
ID = 0; // set breakepoint here
ID = 0; // set breakpoint here
// to stop at allocation of
// block with ID = IDTOSTOP
}
@ -348,7 +364,7 @@ void GfMemoryManagerRelease()
if (ToFree->Type == 1)
{
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d Type: new/delete\n",++n,ToFree->ID,ToFree->Size);
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d ReturnAddress: %p Type: new/delete\n",++n,ToFree->ID,ToFree->Size,ToFree->ReturnAddress);
LeakSizeNewTotal += ToFree->Size;
if (MaxLeakSizeNewTotal < ToFree->Size)
MaxLeakSizeNewTotal = ToFree->Size;
@ -356,7 +372,7 @@ void GfMemoryManagerRelease()
}
else
{
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d Type: malloc/free\n",++n,ToFree->ID,ToFree->Size);
fprintf(stderr,"%04.4d Block: %04.4d Size: %06.6d ReturnAddress: %p Type: malloc/free\n",++n,ToFree->ID,ToFree->Size,ToFree->ReturnAddress);
LeakSizeMallocTotal += ToFree->Size;
if (MaxLeakSizeMallocTotal < ToFree->Size)
MaxLeakSizeMallocTotal = ToFree->Size;

3
src/libs/tgf/memmanager.h
View file

@ -52,7 +52,7 @@ TGF_API void GfMemoryManagerSetup(int AddedSpace);
//
// Memory manager worker functions
void* GfMemoryManagerAlloc(size_t size, unsigned int type);
void* GfMemoryManagerAlloc(size_t size, unsigned int type, void* RetAddr);
void GfMemoryManagerFree(void* b, unsigned int type);
//
@ -63,6 +63,7 @@ typedef struct tDSMMLinkBlock
{
unsigned int Mark; // Marker to identify it as tDSMMLinkBlock
int Size; // Size of allocated block
void* ReturnAddress; // Return address of new/malloc
tDSMMLinkBlock* Prev; // Previous memory block
tDSMMLinkBlock* Next; // Next memory block
unsigned int Type; // Type of allocation

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