Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wxDebugContext to work with global and static objects (patch 901031)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-28 23:57:54 +00:00
parent 121680bff0
commit ced5554416
3 changed files with 102 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/memory.h
View File

@@ -18,6 +18,7 @@
#include "wx/defs.h"
#include "wx/string.h"
#include "wx/msgout.h"
/*
The macro which will be expanded to include the file and line number
@@ -288,6 +289,9 @@ public:
// that are outstanding
static int CountObjectsLeft(bool sinceCheckpoint = FALSE);
// This function is used to output the dump
static void OutputDumpLine(const wxChar *szFormat, ...);
private:
// Store these here to allow access to the list without
// needing to have a wxMemStruct object.
@@ -299,6 +303,31 @@ private:
static bool m_checkPrevious;
};
// Final cleanup (e.g. deleting the log object and doing memory leak checking)
// will be delayed until all wxDebugContextDumpDelayCounter objects have been
// destructed. Adding one wxDebugContextDumpDelayCounter per file will delay
// memory leak checking until after destructing all global objects.
class WXDLLIMPEXP_BASE wxDebugContextDumpDelayCounter
{
public:
wxDebugContextDumpDelayCounter() {
sm_count++;
}
~wxDebugContextDumpDelayCounter() {
sm_count--;
if(!sm_count) DoDump();
}
private:
void DoDump();
static int sm_count;
};
// make leak dump after all globals have been destructed
static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_File;
#define WXDEBUG_DUMPDELAYCOUNTER \
static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_Extra;
// Output a debug message, in a system dependent fashion.
void WXDLLIMPEXP_BASE wxTrace(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1;
void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_PRINTF_2;
@@ -306,7 +335,9 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_P
#define WXTRACE wxTrace
#define WXTRACELEVEL wxTraceLevel
#else // else part for the #if __WXDEBUG__
#else // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#define WXDEBUG_DUMPDELAYCOUNTER
// Borland C++ Builder 6 seems to have troubles with inline functions (see bug
// 819700)
@@ -321,7 +352,7 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_P
#define WXTRACE TRUE ? (void)0 : wxTrace
#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
#endif // __WXDEBUG__
#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#endif
// _WX_MEMORYH__