#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
#ifdef __WXDEBUG__
-WXDLLIMPEXP_BASE void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);
-WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = FALSE);
+WXDLLIMPEXP_BASE void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = false);
+WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
//**********************************************************************************
/*
// We'll only do malloc and free for the moment: leave the interesting
// stuff for the wxObject versions.
-// devik 2000-8-29: All new/delete ops are now inline because they can't
-// be marked as dllexport/dllimport. It then leads to weird bugs when
-// used on MSW as DLL
+
#if wxUSE_GLOBAL_MEMORY_OPERATORS
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#endif
+// devik 2000-8-29: All new/delete ops are now inline because they can't
+// be marked as dllexport/dllimport. It then leads to weird bugs when
+// used on MSW as DLL
+#if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
inline void * operator new (size_t size, wxChar * fileName, int lineNum)
{
- return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
+ return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
}
inline void * operator new (size_t size)
{
- return wxDebugAlloc(size, NULL, 0, FALSE);
+ return wxDebugAlloc(size, NULL, 0, FALSE);
}
inline void operator delete (void * buf)
{
- wxDebugFree(buf, FALSE);
+ wxDebugFree(buf, FALSE);
}
#if wxUSE_ARRAY_MEMORY_OPERATORS
inline void * operator new[] (size_t size)
{
- return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
+ return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
}
inline void * operator new[] (size_t size, wxChar * fileName, int lineNum)
{
- return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
+ return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
}
inline void operator delete[] (void * buf)
{
wxDebugFree(buf, TRUE);
}
-#endif
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+
+#else
+
+void * operator new (size_t size, wxChar * fileName, int lineNum);
+
+void * operator new (size_t size);
+
+void operator delete (void * buf);
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size);
+
+void * operator new[] (size_t size, wxChar * fileName, int lineNum);
+
+void operator delete[] (void * buf);
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
// VC++ 6.0 and MWERKS
#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
{
- wxDebugFree(pData, FALSE);
+ wxDebugFree(pData, false);
}
inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNum */)
{
- wxDebugFree(pData, TRUE);
+ wxDebugFree(pData, true);
}
#endif // __VISUALC__>=1200
#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
static bool GetDebugMode(void) { return debugOn; }
static void SetDebugMode(bool flag) { debugOn = flag; }
- static void SetCheckpoint(bool all = FALSE);
+ static void SetCheckpoint(bool all = false);
static wxMemStruct *GetCheckpoint(void) { return checkPoint; }
// Calculated from the request size and any padding needed
static bool GetCheckPrevious () { return m_checkPrevious; }
static void SetCheckPrevious (bool value) { m_checkPrevious = value; }
- // Checks all nodes, or all nodes if checkAll is TRUE
- static int Check(bool checkAll = FALSE);
+ // Checks all nodes, or all nodes if checkAll is true
+ static int Check(bool checkAll = false);
// Print out the list of wxMemStruct nodes.
static bool PrintList(void);
static bool Dump(void);
// Print statistics
- static bool PrintStatistics(bool detailed = TRUE);
+ static bool PrintStatistics(bool detailed = true);
// Print out the classes in the application.
static bool PrintClasses(void);
// Count the number of non-wxDebugContext-related objects
// that are outstanding
- static int CountObjectsLeft(bool sinceCheckpoint = FALSE);
+ 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
static wxMemStruct* m_head;
static wxMemStruct* m_tail;
- // Set to FALSE if we're not checking all previous nodes when
- // we do a new. Set to TRUE when we are.
+ // Set to false if we're not checking all previous nodes when
+ // we do a new. Set to true when we are.
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;
#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)
#define wxTraceLevel(l, fmt)
#endif
-#define WXTRACE TRUE ? (void)0 : wxTrace
-#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
+#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__
projects / wxWidgets.git / blobdiff