Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable some internal statistics, reporting a race condition.

Browse Source
This commit is contained in:
Erwin Coumans
2018-11-01 07:41:35 -07:00
parent 438e082b33
commit 336a4b65fe
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Bullet3Common/b3AlignedAllocator.cpp
View File

@@ -15,9 +15,11 @@ subject to the following restrictions:
#include "b3AlignedAllocator.h" #include "b3AlignedAllocator.h"
#ifdef B3_ALLOCATOR_STATISTICS
int b3g_numAlignedAllocs = 0; int b3g_numAlignedAllocs = 0;
int b3g_numAlignedFree = 0; int b3g_numAlignedFree = 0;
int b3g_totalBytesAlignedAllocs = 0; //detect memory leaks int b3g_totalBytesAlignedAllocs = 0; //detect memory leaks
#endif
static void *b3AllocDefault(size_t size) static void *b3AllocDefault(size_t size)
{ {
@@ -109,10 +111,10 @@ void *b3AlignedAllocInternal(size_t size, int alignment, int line, char *filenam
{ {
void *ret; void *ret;
char *real; char *real;
#ifdef B3_ALLOCATOR_STATISTICS
b3g_totalBytesAlignedAllocs += size; b3g_totalBytesAlignedAllocs += size;
b3g_numAlignedAllocs++; b3g_numAlignedAllocs++;
#endif
real = (char *)b3s_allocFunc(size + 2 * sizeof(void *) + (alignment - 1)); real = (char *)b3s_allocFunc(size + 2 * sizeof(void *) + (alignment - 1));
if (real) if (real)
{ {
@@ -135,14 +137,16 @@ void *b3AlignedAllocInternal(size_t size, int alignment, int line, char *filenam
void b3AlignedFreeInternal(void *ptr, int line, char *filename) void b3AlignedFreeInternal(void *ptr, int line, char *filename)
{ {
void *real; void *real;
#ifdef B3_ALLOCATOR_STATISTICS
b3g_numAlignedFree++; b3g_numAlignedFree++;
#endif
if (ptr) if (ptr)
{ {
real = *((void **)(ptr)-1); real = *((void **)(ptr)-1);
int size = *((int *)(ptr)-2); int size = *((int *)(ptr)-2);
#ifdef B3_ALLOCATOR_STATISTICS
b3g_totalBytesAlignedAllocs -= size; b3g_totalBytesAlignedAllocs -= size;
#endif
b3Printf("free #%d at address %x, from %s,line %d, size %d\n", b3g_numAlignedFree, real, filename, line, size); b3Printf("free #%d at address %x, from %s,line %d, size %d\n", b3g_numAlignedFree, real, filename, line, size);
b3s_freeFunc(real); b3s_freeFunc(real);
@@ -157,7 +161,9 @@ void b3AlignedFreeInternal(void *ptr, int line, char *filename)
void *b3AlignedAllocInternal(size_t size, int alignment) void *b3AlignedAllocInternal(size_t size, int alignment)
{ {
#ifdef B3_ALLOCATOR_STATISTICS
b3g_numAlignedAllocs++; b3g_numAlignedAllocs++;
#endif
void *ptr; void *ptr;
ptr = b3s_alignedAllocFunc(size, alignment); ptr = b3s_alignedAllocFunc(size, alignment);
// b3Printf("b3AlignedAllocInternal %d, %x\n",size,ptr); // b3Printf("b3AlignedAllocInternal %d, %x\n",size,ptr);
@@ -170,8 +176,9 @@ void b3AlignedFreeInternal(void *ptr)
{ {
return; return;
} }
#ifdef B3_ALLOCATOR_STATISTICS
b3g_numAlignedFree++; b3g_numAlignedFree++;
#endif
// b3Printf("b3AlignedFreeInternal %x\n",ptr); // b3Printf("b3AlignedFreeInternal %x\n",ptr);
b3s_alignedFreeFunc(ptr); b3s_alignedFreeFunc(ptr);
} }