RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove recursion_protect on win32_malloc_hook (not needed)

This commit is contained in:
David Rose 2007-06-29 01:44:17 +00:00
parent b03baf5afd
commit 0e9aabb75b
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
panda/src/express/memoryUsage.cxx
View File

@ -335,32 +335,30 @@ int MemoryUsage::
win32_malloc_hook(int alloc_type, void *ptr,
size_t size, int block_use, long request,
const unsigned char *filename, int line) {
if (!_recursion_protect) {
MemoryUsage *mu = get_global_ptr();
if (mu->_count_memory_usage) {
int increment = 0;
switch (alloc_type) {
case _HOOK_ALLOC:
increment = size;
break;
case _HOOK_REALLOC:
increment = size - _msize(ptr);
break;
case _HOOK_FREE:
increment = - ((int)_msize(ptr));
break;
}
MemoryUsage *mu = get_global_ptr();
if (mu->_count_memory_usage) {
int increment = 0;
switch (alloc_type) {
case _HOOK_ALLOC:
increment = size;
break;
mu->_total_size += increment;
case _HOOK_REALLOC:
increment = size - _msize(ptr);
break;
case _HOOK_FREE:
increment = - ((int)_msize(ptr));
break;
}
mu->_total_size += increment;
#ifdef TRACK_IN_INTERPRETER
if (in_interpreter) {
mu->_interpreter_size += increment;
}
#endif
if (in_interpreter) {
mu->_interpreter_size += increment;
}
#endif
}
return true;