X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..1aaf88d2208793f6a05f02c3e23ade668555d31e:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 7cac322e8d..9e6c3beaed 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -5,11 +5,11 @@
 // 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
 
@@ -26,27 +26,27 @@
 
 #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
 
-#include <wx/log.h>
+#if wxUSE_THREADS
+#include "wx/thread.h"
+#endif
+
+#include "wx/log.h"
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
 
-#if wxUSE_IOSTREAMH
-    #include <fstream.h>
-#else
-    #include <fstream>
-#endif
-
-#if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
+     && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #include <memory.h>
 #endif
 
@@ -54,7 +54,7 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
 
 #ifdef GetClassInfo
 #undef GetClassInfo
@@ -68,6 +68,13 @@
 
 #include "wx/memory.h"
 
+#if wxUSE_THREADS && defined(__WXDEBUG__)
+#define USE_THREADSAFE_MEMORY_ALLOCATION 1
+#else
+#define USE_THREADSAFE_MEMORY_ALLOCATION 0
+#endif
+
+
 #ifdef new
 #undef new
 #endif
@@ -110,10 +117,8 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
-  wxLogDebug("wxWindows memory checking error: %s", mesg);
+  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);
   PrintNode ();
-
-//         << m_fileName << ' ' << m_lineNum << endl;
 }
 
 /*
@@ -121,10 +126,8 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
-  wxLogDebug("wxWindows over/underwrite memory error:");
+  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));
   PrintNode ();
-
-//    cerr << m_fileName << ' ' << m_lineNum << endl;
 }
 
 
@@ -329,34 +332,34 @@ void wxMemStruct::PrintNode ()
 
     // Let's put this in standard form so IDEs can load the file at the appropriate
     // line
-    wxString msg("");
+    wxString msg;
 
     if (m_fileName)
-      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (info && info->GetClassName())
       msg += info->GetClassName();
     else
-      msg += "object";
+      msg += wxT("object");
 
     wxString msg2;
-    msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
+    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
-    wxLogDebug(msg);
+    wxLogMessage(msg);
   }
   else
   {
-    wxString msg("");
+    wxString msg;
 
     if (m_fileName)
-      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
-    msg += ("non-object data");
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+    msg += wxT("non-object data");
     wxString msg2;
-    msg2.Printf(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+    msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
-    wxLogDebug(msg);
+    wxLogMessage(msg);
   }
 }
 
@@ -368,9 +371,9 @@ void wxMemStruct::Dump ()
   {
     wxObject *obj = (wxObject *)m_actualData;
 
-    wxString msg("");
+    wxString msg;
     if (m_fileName)
-      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
 
     /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
@@ -383,24 +386,24 @@ void wxMemStruct::Dump ()
     if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
       msg += obj->GetClassInfo()->GetClassName();
     else
-      msg += "unknown object class";
+      msg += wxT("unknown object class");
 
-    wxString msg2("");
-    msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
+    wxString msg2;
+    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
-    wxLogDebug(msg);
+    wxDebugContext::OutputDumpLine(msg);
   }
   else
   {
-    wxString msg("");
+    wxString msg;
     if (m_fileName)
-      msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
-    wxString msg2("");
-    msg2.Printf("non-object data at $%lX, size %d", (long)GetActualData(), (int)RequestSize() );
+    wxString msg2;
+    msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
-    wxLogDebug(msg);
+    wxDebugContext::OutputDumpLine(msg);
   }
 }
 
@@ -418,7 +421,7 @@ int wxMemStruct::ValidateNode ()
         else {
             // Can't use the error routines as we have no recognisable object.
 #ifndef __WXGTK__
-             wxLogDebug("Can't verify memory struct - all bets are off!");
+             wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));
 #endif
         }
         return 0;
@@ -460,90 +463,25 @@ int wxMemStruct::ValidateNode ()
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
-// ostream *wxDebugContext::m_debugStream = NULL;
-// streambuf *wxDebugContext::m_streamBuf = NULL;
-
-// Must initialise these in wxEntry, and then delete them just before wxEntry exits
-streambuf *wxDebugContext::m_streamBuf = NULL;
-ostream *wxDebugContext::m_debugStream = NULL;
 
-bool wxDebugContext::m_checkPrevious = FALSE;
+bool wxDebugContext::m_checkPrevious = false;
 int wxDebugContext::debugLevel = 1;
-bool wxDebugContext::debugOn = TRUE;
+bool wxDebugContext::debugOn = true;
 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
+// For faster alignment calculation
+static wxMarkerType markerCalc[2];
+int wxDebugContext::m_balign = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]);
+int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]) - 1;
+
 wxDebugContext::wxDebugContext(void)
 {
-//  m_streamBuf = new wxDebugStreamBuf;
-//  m_debugStream = new ostream(m_streamBuf);
 }
 
 wxDebugContext::~wxDebugContext(void)
 {
-  SetStream(NULL, NULL);
 }
 
-/*
- * It's bizarre, but with BC++ 4.5, the value of str changes
- * between SetFile and SetStream.
- */
-
-void wxDebugContext::SetStream(ostream *str, streambuf *buf)
-{
-  if (m_debugStream)
-  {
-    m_debugStream->flush();
-    delete m_debugStream;
-  }
-  m_debugStream = NULL;
-
-  // Not allowed in Watcom (~streambuf is protected).
-  // Is this trying to say something significant to us??
-#ifndef __WATCOMC__
-  if (m_streamBuf)
-  {
-    streambuf* oldBuf = m_streamBuf;
-    m_streamBuf = NULL;
-    delete oldBuf;
-  }
-#endif
-  m_streamBuf = buf;
-  m_debugStream = str;
-}
-
-bool wxDebugContext::SetFile(const wxString& file)
-{
-  ofstream *str = new ofstream((char *) (const char *)file);
-
-  if (str->bad())
-  {
-    delete str;
-    return FALSE;
-  }
-  else
-  {
-    SetStream(str);
-    return TRUE;
-  }
-}
-
-bool wxDebugContext::SetStandardError(void)
-{
-    // Obsolete
-#if 0
-#if !defined(_WINDLL)
-  wxDebugStreamBuf *buf = new wxDebugStreamBuf;
-  ostream *stream = new ostream(m_streamBuf);
-  SetStream(stream, buf);
-  return TRUE;
-#else
-  return FALSE;
-#endif
-#endif
-  return FALSE;
-}
-
-
 /*
   Work out the positions of the markers by creating an array of 2 markers
   and comparing the addresses of the 2 elements. Use this number as the
@@ -595,6 +533,9 @@ char * wxDebugContext::StartPos (const char * caller)
 
   I don't know how portable this stuff is, but it seems to work for me at
   the moment. It would be real nice if I knew more about this!
+
+  // Note: this function is now obsolete (along with CalcAlignment)
+  // because the calculations are done statically, for greater speed.
 */
 size_t wxDebugContext::GetPadding (const size_t size)
 {
@@ -602,11 +543,17 @@ size_t wxDebugContext::GetPadding (const size_t size)
     return (pad) ? sizeof(wxMarkerType) - pad : 0;
 }
 
-
-
 size_t wxDebugContext::PaddedSize (const size_t size)
 {
-    return size + GetPadding (size);
+    // Added by Terry Farnham <TJRT@pacbell.net> to replace
+    // slow GetPadding call.
+    int padb;
+
+    padb = size & m_balignmask;
+    if(padb)
+        return(size + m_balign - padb);
+    else
+        return(size);
 }
 
 /*
@@ -629,7 +576,8 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
   if (!from)
     from = wxDebugContext::GetHead ();
 
-  for (wxMemStruct * st = from; st != 0; st = st->m_next)
+  wxMemStruct * st = NULL;
+  for (st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();
 //      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
@@ -647,62 +595,57 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 bool wxDebugContext::PrintList (void)
 {
 #ifdef __WXDEBUG__
-//  if (!HasStream())
-//    return FALSE;
-
   TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
-  return TRUE;
+  return true;
 #else
-  return FALSE;
+  return false;
 #endif
 }
 
 bool wxDebugContext::Dump(void)
 {
 #ifdef __WXDEBUG__
-//  if (!HasStream())
-//    return FALSE;
-
-  if (TRUE)
   {
-    char* appName = "application";
-    wxString appNameStr("");
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr;
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
-        appName = (char*) (const char*) appNameStr;
-        wxLogDebug("----- Memory dump of %s at %s -----", appName, WXSTRINGCAST wxNow() );
+        appName = WXSTRINGCAST appNameStr;
+        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
     }
     else
     {
-      wxLogDebug( "----- Memory dump -----" );
+      OutputDumpLine( wxT("----- Memory dump -----") );
     }
   }
+
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
-  wxLogDebug( "" );
-  wxLogDebug( "" );
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);
 
-  return TRUE;
+  return true;
 #else
-  return FALSE;
+  return false;
 #endif
 }
 
+#ifdef __WXDEBUG__
 struct wxDebugStatsStruct
 {
   long instanceCount;
   long totalSize;
-  char *instanceClass;
+  wxChar *instanceClass;
   wxDebugStatsStruct *next;
 };
 
-static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, char *name)
+static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name)
 {
   while (st)
   {
-    if (strcmp(st->instanceClass, name) == 0)
+    if (wxStrcmp(st->instanceClass, name) == 0)
       return st;
     st = st->next;
   }
@@ -714,31 +657,28 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
   st->next = head;
   return st;
 }
+#endif
 
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 #ifdef __WXDEBUG__
-//  if (!HasStream())
-//    return FALSE;
-
-  if (TRUE)
   {
-    char* appName = "application";
-    wxString appNameStr("");
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr;
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
-        appName = (char*) (const char*) appNameStr;
-        wxLogDebug("----- Memory statistics of %s at %s -----", appName, WXSTRINGCAST wxNow() );
+        appName = WXSTRINGCAST appNameStr;
+        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
     }
     else
     {
-      wxLogDebug( "----- Memory statistics -----" );
+      OutputDumpLine( wxT("----- Memory statistics -----") );
     }
   }
 
   bool currentMode = GetDebugMode();
-  SetDebugMode(FALSE);
+  SetDebugMode(false);
 
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
@@ -754,15 +694,14 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   for (st = from; st != 0; st = st->m_next)
   {
     void* data = st->GetActualData();
-//    if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
-      if (detailed && (data != (void*) wxLog::GetActiveTarget()))
+    if (detailed && (data != (void*) wxLog::GetActiveTarget()))
     {
-      char *className = "nonobject";
+      wxChar *className = (wxChar*) wxT("nonobject");
       if (st->m_isObject && st->GetActualData())
       {
         wxObject *obj = (wxObject *)st->GetActualData();
         if (obj->GetClassInfo()->GetClassName())
-          className = obj->GetClassInfo()->GetClassName();
+          className = (wxChar*)obj->GetClassInfo()->GetClassName();
       }
       wxDebugStatsStruct *stats = FindStatsStruct(list, className);
       if (!stats)
@@ -777,7 +716,6 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       stats->totalSize += st->RequestSize();
     }
 
-//    if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
     if (data != (void*) wxLog::GetActiveTarget())
     {
         totalSize += st->RequestSize();
@@ -792,85 +730,82 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
-      wxLogDebug("%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);
     }
-    wxLogDebug("");
+    OutputDumpLine(wxEmptyString);
   }
 
   SetDebugMode(currentMode);
 
-  wxLogDebug("Number of object items: %ld", noObjectNodes);
-  wxLogDebug("Number of non-object items: %ld", noNonObjectNodes);
-  wxLogDebug("Total allocated size: %ld", totalSize);
-  wxLogDebug("");
-  wxLogDebug("");
+  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(wxEmptyString);
+  OutputDumpLine(wxEmptyString);
 
-  return TRUE;
+  return true;
 #else
-  return FALSE;
+  (void)detailed;
+  return false;
 #endif
 }
 
 bool wxDebugContext::PrintClasses(void)
 {
-//  if (!HasStream())
-//    return FALSE;
-
-  if (TRUE)
   {
-    char* appName = "application";
-    wxString appNameStr("");
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr;
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
-        appName = (char*) (const char*) appNameStr;
-        wxLogDebug("----- Classes in %s -----", appName);
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Classes in %s -----"), appName);
     }
   }
 
   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());
-        msg += " ";
+        msg += wxT(" ");
 
         if (info->GetBaseClassName1() && !info->GetBaseClassName2())
         {
-            msg += "is a ";
+            msg += wxT("is a ");
             msg += info->GetBaseClassName1();
         }
         else if (info->GetBaseClassName1() && info->GetBaseClassName2())
         {
-            msg += "is a ";
+            msg += wxT("is a ");
             msg += info->GetBaseClassName1() ;
-            msg += ", ";
+            msg += wxT(", ");
             msg += info->GetBaseClassName2() ;
         }
         if (info->GetConstructor())
-            msg += ": dynamic";
+            msg += wxT(": dynamic");
 
-        wxLogDebug(msg);
+        wxLogMessage(msg);
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }
-  wxLogDebug("");
-  wxLogDebug("There are %d classes derived from wxObject.", n);
-  wxLogDebug("");
-  wxLogDebug("");
-  return TRUE;
+  wxLogMessage(wxEmptyString);
+  wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
+  wxLogMessage(wxEmptyString);
+  wxLogMessage(wxEmptyString);
+  return true;
 }
 
 void wxDebugContext::SetCheckpoint(bool all)
@@ -916,7 +851,6 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   for (wxMemStruct * st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();
-//      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
       if (data != (void*) wxLog::GetActiveTarget())
           n ++;
   }
@@ -924,114 +858,111 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   return n ;
 }
 
-/*
-  The global operator new used for everything apart from getting
-  dynamic storage within this function itself.
-*/
+// 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)/sizeof(wxChar)-1] = _T('\0');
+
+    // keep 3 bytes for a \r\n\0
+    count = wxVsnprintf(buf, sizeof(buf)/sizeof(wxChar)-3, szFormat, argptr);
+
+    if ( count < 0 )
+        count = sizeof(buf)/sizeof(wxChar)-3;
+    buf[count]=_T('\r');
+    buf[count+1]=_T('\n');
+    buf[count+2]=_T('\0');
+
+    wxMessageOutputDebug dbgout;
+    dbgout.Printf(buf);
+}
 
-// We'll only do malloc and free for the moment: leave the interesting
-// stuff for the wxObject versions.
 
-#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+static bool memSectionOk = false;
 
-#ifdef new
-#undef new
-#endif
-
-// Seems OK all of a sudden. Maybe to do with linking with multithreaded library?
-#if 0 // def __VISUALC__
-#define NO_DEBUG_ALLOCATION
-#endif
-
-// Unfortunately ~wxDebugStreamBuf doesn't work (VC++ 5) when we enable the debugging
-// code. I have no idea why. In BC++ 4.5, we have a similar problem the debug
-// stream myseriously changing pointer address between being passed from SetFile to SetStream.
-// See docs/msw/issues.txt.
-void * operator new (size_t size, char * fileName, int lineNum)
+class MemoryCriticalSection : public wxCriticalSection
 {
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
-#endif
-}
+public:
+    MemoryCriticalSection() {
+        memSectionOk = true;
+    }
+    ~MemoryCriticalSection() {
+        memSectionOk = false;
+    }
+};
 
-// Added JACS 25/11/98
-void * operator new (size_t size)
+class MemoryCriticalSectionLocker
 {
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, NULL, 0, FALSE);
+public:
+    inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)
+    : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
+    inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
+
+private:
+    // no assignment operator nor copy ctor
+    MemoryCriticalSectionLocker(const MemoryCriticalSectionLocker&);
+    MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
+
+    wxCriticalSection& m_critsect;
+    bool m_locked;
+};
+
+static MemoryCriticalSection memLocker;
+
 #endif
-}
 
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size)
+void * operator new (size_t size, wxChar * fileName, int lineNum)
 {
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
-#endif
+    return wxDebugAlloc(size, fileName, lineNum, false, false);
 }
-#endif
 
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size, char * fileName, int lineNum)
+void * operator new (size_t size)
 {
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
-#endif
+    return wxDebugAlloc(size, NULL, 0, false);
 }
-#endif
 
 void operator delete (void * buf)
 {
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf);
-#endif
+    wxDebugFree(buf, false);
 }
 
-// VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size)
 {
-// ::operator delete(pData);
-  // JACS 21/11/1998: surely we need to call wxDebugFree?
-  wxDebugFree(pData, FALSE);
+    return wxDebugAlloc(size, NULL, 0, false, true);
 }
-// New operator 21/11/1998
-void operator delete[](void* pData, char* /* fileName */, int /* lineNum */)
+
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)
 {
-  wxDebugFree(pData, TRUE);
+    return wxDebugAlloc(size, fileName, lineNum, false, true);
 }
-#endif
-
-#if wxUSE_ARRAY_MEMORY_OPERATORS
 
 void operator delete[] (void * buf)
 {
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf, TRUE);
-#endif
+  wxDebugFree(buf, true);
 }
 #endif
 
-#endif
-
 // TODO: store whether this is a vector or not.
-void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
+void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 {
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+  MemoryCriticalSectionLocker lock(memLocker);
+#endif
+
   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
 
+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+// VA 3.0 still has trouble in here
+  return (void *)malloc(size);
+#endif
   if (!wxDebugContext::GetDebugMode())
   {
     return (void *)malloc(size);
@@ -1040,7 +971,7 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {
-        wxLogDebug("Call to malloc (%ld) failed.", (long)size);
+        wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);
         return 0;
     }
     wxMemStruct * st = (wxMemStruct *)buf;
@@ -1081,9 +1012,17 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
 // TODO: check whether was allocated as a vector
 void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 {
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+  MemoryCriticalSectionLocker lock(memLocker);
+#endif
+
   if (!buf)
     return;
 
+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+// VA 3.0 still has trouble in here
+  free((char *)buf);
+#endif
   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
   if (!wxDebugContext::GetDebugMode())
@@ -1117,17 +1056,17 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
                    st->RequestSize ());
 
-    // Don't allow delayed freeing of memory in this version
-//    if (!wxDebugContext::GetDelayFree())
-//    free((void *)st);
     free((char *)st);
 }
 
 // Trace: send output to the current debugging stream
-void wxTrace(const char *fmt ...)
+void wxTrace(const wxChar * ...)
 {
-  va_list ap;
-  static char buffer[512];
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
+    va_list ap;
+  static wxChar buffer[512];
 
   va_start(ap, fmt);
 
@@ -1146,25 +1085,33 @@ void wxTrace(const char *fmt ...)
   }
   else
 #ifdef __WXMSW__
-    OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+    OutputDebugString((LPCTSTR)buffer) ;
+#else
+    OutputDebugString((const char*) buffer) ;
+#endif
 #else
     fprintf(stderr, buffer);
 #endif
+#endif
 }
 
 // Trace with level
-void wxTraceLevel(int level, const char *fmt ...)
+void wxTraceLevel(int, const wxChar * ...)
 {
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
   if (wxDebugContext::GetLevel() < level)
     return;
 
   va_list ap;
-  static char buffer[512];
+  static wxChar buffer[512];
 
   va_start(ap, fmt);
 
 #ifdef __WXMSW__
-  wvsprintf(buffer,fmt,ap) ;
+  wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
 #endif
@@ -1178,19 +1125,39 @@ void wxTraceLevel(int level, const char *fmt ...)
   }
   else
 #ifdef __WXMSW__
-    OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+    OutputDebugString((LPCTSTR)buffer) ;
+#else
+    OutputDebugString((const char*) buffer) ;
+#endif
 #else
     fprintf(stderr, buffer);
 #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 destroyed
+//----------------------------------------------------------------------------
+
+// Don't set it to 0 by dynamic initialization
+// Some compilers will really do the assignment 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 cleanup counter object
+static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
+
+#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT