// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "memory.h"
#endif
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
// #pragma implementation
#endif
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
+#include "wx/hash.h"
#endif
#if wxUSE_THREADS
#include "wx/ioswrap.h"
-// Obsolete
-#if 0
-#if wxUSE_IOSTREAMH
- #include <fstream.h>
-#else
- #include <fstream>
-#endif
-#endif
-
#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
&& !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <memory.h>
#include <string.h>
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#ifdef GetClassInfo
#undef GetClassInfo
#include "wx/memory.h"
+#if wxUSE_THREADS && defined(__WXDEBUG__) && !defined(__WXMAC__)
+#define USE_THREADSAFE_MEMORY_ALLOCATION 1
+#else
+#define USE_THREADSAFE_MEMORY_ALLOCATION 0
+#endif
+
+
#ifdef new
#undef new
#endif
msg += wxT("object");
wxString msg2;
- msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
wxLogMessage(msg);
}
else
{
- wxString msg("");
+ wxString msg(wxT(""));
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
msg += wxT("non-object data");
wxString msg2;
- msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
wxLogMessage(msg);
else
msg += wxT("unknown object class");
- wxString msg2("");
- msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+ wxString msg2(wxT(""));
+ msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogMessage(msg);
+ wxDebugContext::OutputDumpLine(msg);
}
else
{
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
- wxString msg2("");
- msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
+ wxString msg2(wxT(""));
+ msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
msg += msg2;
- wxLogMessage(msg);
+ wxDebugContext::OutputDumpLine(msg);
}
}
#ifdef __WXDEBUG__
{
wxChar* appName = (wxChar*) wxT("application");
- wxString appNameStr("");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+ OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogMessage( wxT("----- Memory dump -----") );
+ OutputDumpLine( wxT("----- Memory dump -----") );
}
}
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- wxLogMessage( wxT("") );
- wxLogMessage( wxT("") );
+ OutputDumpLine( wxT("") );
+ OutputDumpLine( wxT("") );
return TRUE;
#else
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+ OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogMessage( wxT("----- Memory statistics -----") );
+ OutputDumpLine( wxT("----- Memory statistics -----") );
}
}
{
while (list)
{
- wxLogMessage(wxT("%ld objects of class %s, total size %ld"),
+ OutputDumpLine(wxT("%ld objects of class %s, total size %ld"),
list->instanceCount, list->instanceClass, list->totalSize);
wxDebugStatsStruct *old = list;
list = old->next;
free((char *)old);
}
- wxLogMessage(wxT(""));
+ OutputDumpLine(wxT(""));
}
SetDebugMode(currentMode);
- wxLogMessage(wxT("Number of object items: %ld"), noObjectNodes);
- wxLogMessage(wxT("Number of non-object items: %ld"), noNonObjectNodes);
- wxLogMessage(wxT("Total allocated size: %ld"), totalSize);
- wxLogMessage(wxT(""));
- wxLogMessage(wxT(""));
+ OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes);
+ OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes);
+ OutputDumpLine(wxT("Total allocated size: %ld"), totalSize);
+ OutputDumpLine(wxT(""));
+ OutputDumpLine(wxT(""));
return TRUE;
#else
}
int n = 0;
- wxNode *node;
+ wxHashTable::compatibility_iterator node;
wxClassInfo *info;
wxClassInfo::sm_classTable->BeginFind();
node = wxClassInfo::sm_classTable->Next();
while (node)
{
- info = (wxClassInfo *)node->Data();
+ info = (wxClassInfo *)node->GetData();
if (info->GetClassName())
{
wxString msg(info->GetClassName());
return n ;
}
-#if wxUSE_THREADS
+// This function is used to output the dump
+void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
+{
+ // a buffer of 2048 bytes should be long enough for a file name
+ // and a class name
+ wxChar buf[2048];
+ int count;
+ va_list argptr;
+ va_start(argptr, szFormat);
+ buf[sizeof(buf)-1] = _T('\0');
+
+ // keep 3 bytes for a \r\n\0
+ count = wxVsnprintf(buf, sizeof(buf)-3, szFormat, argptr);
+
+ if ( count < 0 )
+ count = sizeof(buf)-3;
+ buf[count]=_T('\r');
+ buf[count+1]=_T('\n');
+ buf[count+2]=_T('\0');
+
+ wxMessageOutputDebug dbgout;
+ dbgout.Printf(buf);
+}
+
+
+#if USE_THREADSAFE_MEMORY_ALLOCATION
static bool memSectionOk = FALSE;
class MemoryCriticalSection : public wxCriticalSection
// TODO: store whether this is a vector or not.
void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
{
-#if wxUSE_THREADS
+#if USE_THREADSAFE_MEMORY_ALLOCATION
MemoryCriticalSectionLocker lock(memLocker);
#endif
// TODO: check whether was allocated as a vector
void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
{
-#if wxUSE_THREADS
+#if USE_THREADSAFE_MEMORY_ALLOCATION
MemoryCriticalSectionLocker lock(memLocker);
#endif
#endif
}
-#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
-void wxTrace(const char *WXUNUSED(fmt) ...)
-{
-}
+//----------------------------------------------------------------------------
+// Final cleanup after all global objects in all files have been destructed
+//----------------------------------------------------------------------------
+
+// Don't set it to 0 by dynamic initialization
+// Some compilers will realy do the asignment later
+// All global variables are initialized to 0 at the very beginning, and this is just fine.
+int wxDebugContextDumpDelayCounter::sm_count;
-void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
+void wxDebugContextDumpDelayCounter::DoDump()
{
+ if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+ {
+ wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
+ wxDebugContext::Dump();
+ wxDebugContext::PrintStatistics();
+ }
}
-#endif
+
+// Even if there is nothing else, make sure that there is at
+// least one clenup counter object
+static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
+
+#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
projects / wxWidgets.git / blobdiff