From 7e1c44fcbe71f95c7b39b7258f328b731464ed96 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 24 Feb 2016 10:45:31 -0600 Subject: [PATCH] this seems to stabilize things; if it does not we can try setting DO_GUARDS and the other flags back on one by one... --- .../sharedMemoryManager/src/shared/MemoryManager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp index d8db6b31..920bd427 100755 --- a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp +++ b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp @@ -121,7 +121,7 @@ namespace MemoryManagerNamespace bool m_array:1; #endif #if DO_TRACK - bool m_leakTest:1; + bool m_leakTest:0; #endif #if DO_TRACK || DO_GUARDS unsigned int m_requestedSize:cms_requestedSizeBits; @@ -224,6 +224,11 @@ namespace MemoryManagerNamespace int ms_systemMemoryAllocatedMegabytes; bool ms_reportAllocations; + PixCounter::ResetInteger ms_allocationsPerFrame; + PixCounter::ResetInteger ms_bytesAllocatedPerFrame; + PixCounter::ResetInteger ms_freesPerFrame; + PixCounter::ResetInteger ms_bytesFreedPerFrame; + #ifdef _DEBUG bool ms_debugReportFlag; bool ms_debugReportMapFlag;