add an overview

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 5302fe214d5001cbe450a8589e79bf8ac60db193..29b31bdfeb4bfdd8ae6b99849bc777c9c0b84bdc 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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
 
 #pragma implementation "memory.h"
 #endif
 


@@ -26,13 +26,18 @@
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 
 #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"
 // #pragma implementation
 #endif
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/app.h"

+#include "wx/hash.h"
+#endif
+
+#if wxUSE_THREADS
+#include "wx/thread.h"

 #endif
 
 #include "wx/log.h"
 #endif
 
 #include "wx/log.h"


@@ -40,15 +45,6 @@
 
 #include "wx/ioswrap.h"
 
 
 #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>
 #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
      && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #include <memory.h>


@@ -58,7 +54,7 @@
 #include <string.h>
 
 #ifdef __WXMSW__
 #include <string.h>
 
 #ifdef __WXMSW__

-#include <windows.h>
+#include "wx/msw/wrapwin.h"

 
 #ifdef GetClassInfo
 #undef GetClassInfo
 
 #ifdef GetClassInfo
 #undef GetClassInfo


@@ -72,6 +68,13 @@
 
 #include "wx/memory.h"
 
 
 #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
 #ifdef new
 #undef new
 #endif


@@ -116,8 +119,6 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 {
   wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
   PrintNode ();
 {
   wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
   PrintNode ();

-
-//         << m_fileName << ' ' << m_lineNum << endl;

 }
 
 /*
 }
 
 /*


@@ -127,8 +128,6 @@ void wxMemStruct::ErrorMsg ()
 {
   wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
   PrintNode ();
 {
   wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
   PrintNode ();

-
-//    cerr << m_fileName << ' ' << m_lineNum << endl;

 }
 
 
 }
 
 


@@ -351,7 +350,7 @@ void wxMemStruct::PrintNode ()
   }
   else
   {
   }
   else
   {

-    wxString msg("");
+    wxString msg(wxT(""));

 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);


@@ -389,7 +388,7 @@ void wxMemStruct::Dump ()
     else
       msg += wxT("unknown object class");
 
     else
       msg += wxT("unknown object class");
 

-    wxString msg2("");
+    wxString msg2(wxT(""));

     msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
     msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 


@@ -401,7 +400,7 @@ void wxMemStruct::Dump ()
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 

-    wxString msg2("");
+    wxString msg2(wxT(""));

     msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
     wxLogMessage(msg);
     msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
     wxLogMessage(msg);


@@ -464,15 +463,6 @@ int wxMemStruct::ValidateNode ()
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;

-// wxSTD ostream *wxDebugContext::m_debugStream = NULL;
-// wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
-
-// Must initialise these in wxEntry, and then delete them just before wxEntry exits
-// Obsolete
-#if 0
-wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
-wxSTD ostream *wxDebugContext::m_debugStream = NULL;
-#endif

 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;
 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;


@@ -486,78 +476,11 @@ int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&marker
 
 wxDebugContext::wxDebugContext(void)
 {
 
 wxDebugContext::wxDebugContext(void)
 {

-//  m_streamBuf = new wxDebugStreamBuf;
-//  m_debugStream = new wxSTD ostream(m_streamBuf);

 }
 
 wxDebugContext::~wxDebugContext(void)
 {
 }
 
 wxDebugContext::~wxDebugContext(void)
 {

-//  SetStream(NULL, NULL);
-}
-
-/*
- * It's bizarre, but with BC++ 4.5, the value of str changes
- * between SetFile and SetStream.
- */
-
-// Obsolete
-#if 0
-void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD 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)
-  {
-    wxSTD streambuf* oldBuf = m_streamBuf;
-    m_streamBuf = NULL;
-    delete oldBuf;
-  }
-#endif
-  m_streamBuf = buf;
-  m_debugStream = str;
-}
-
-bool wxDebugContext::SetFile(const wxString& file)
-{
-  wxSTD ofstream *str = new wxSTD ofstream(file.mb_str());
-
-  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;
-  wxSTD ostream *stream = new wxSTD ostream(m_streamBuf);
-  SetStream(stream, buf);
-  return TRUE;
-#else
-  return FALSE;
-#endif
-#endif
-  return FALSE;

 }
 }

-#endif
-    // 0

 
 /*
   Work out the positions of the markers by creating an array of 2 markers
 
 /*
   Work out the positions of the markers by creating an array of 2 markers


@@ -631,11 +554,6 @@ size_t wxDebugContext::PaddedSize (const size_t size)
         return(size + m_balign - padb);
     else
         return(size);
         return(size + m_balign - padb);
     else
         return(size);

-
-// Old (slow) code
-#if 0
-    return size + GetPadding (size);
-#endif

 }
 
 /*
 }
 
 /*


@@ -677,9 +595,6 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 bool wxDebugContext::PrintList (void)
 {
 #ifdef __WXDEBUG__
 bool wxDebugContext::PrintList (void)
 {
 #ifdef __WXDEBUG__

-//  if (!HasStream())
-//    return FALSE;
-

   TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
   return TRUE;
   TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
   return TRUE;


@@ -691,13 +606,9 @@ bool wxDebugContext::PrintList (void)
 bool wxDebugContext::Dump(void)
 {
 #ifdef __WXDEBUG__
 bool wxDebugContext::Dump(void)
 {
 #ifdef __WXDEBUG__

-//  if (!HasStream())
-//    return FALSE;
-
-//  if (TRUE)

   {
     wxChar* appName = (wxChar*) wxT("application");
   {
     wxChar* appName = (wxChar*) wxT("application");

-    wxString appNameStr("");
+    wxString appNameStr(wxT(""));

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();


@@ -709,6 +620,7 @@ bool wxDebugContext::Dump(void)
       wxLogMessage( wxT("----- Memory dump -----") );
     }
   }
       wxLogMessage( wxT("----- Memory dump -----") );
     }
   }

+

   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
   wxLogMessage( wxT("") );
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
   wxLogMessage( wxT("") );


@@ -750,10 +662,6 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 #ifdef __WXDEBUG__
 bool wxDebugContext::PrintStatistics(bool detailed)
 {
 #ifdef __WXDEBUG__

-//  if (!HasStream())
-//    return FALSE;
-
-//  if (TRUE)

   {
     wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr(wxT(""));
   {
     wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr(wxT(""));


@@ -786,8 +694,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   for (st = from; st != 0; st = st->m_next)
   {
     void* data = st->GetActualData();
   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()))

     {
       wxChar *className = (wxChar*) wxT("nonobject");
       if (st->m_isObject && st->GetActualData())
     {
       wxChar *className = (wxChar*) wxT("nonobject");
       if (st->m_isObject && st->GetActualData())


@@ -809,7 +716,6 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       stats->totalSize += st->RequestSize();
     }
 
       stats->totalSize += st->RequestSize();
     }
 

-//    if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))

     if (data != (void*) wxLog::GetActiveTarget())
     {
         totalSize += st->RequestSize();
     if (data != (void*) wxLog::GetActiveTarget())
     {
         totalSize += st->RequestSize();


@@ -850,10 +756,6 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 
 bool wxDebugContext::PrintClasses(void)
 {
 
 bool wxDebugContext::PrintClasses(void)
 {

-//  if (!HasStream())
-//    return FALSE;
-
-//  if (TRUE)

   {
     wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr(wxT(""));
   {
     wxChar* appName = (wxChar*) wxT("application");
     wxString appNameStr(wxT(""));


@@ -866,14 +768,14 @@ bool wxDebugContext::PrintClasses(void)
   }
 
   int n = 0;
   }
 
   int n = 0;

-  wxNode *node;
+  wxHashTable::compatibility_iterator node;

   wxClassInfo *info;
 
   wxClassInfo::sm_classTable->BeginFind();
   node = wxClassInfo::sm_classTable->Next();
   while (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());
     if (info->GetClassName())
     {
         wxString msg(info->GetClassName());


@@ -949,7 +851,6 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   for (wxMemStruct * st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();
   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 ++;
   }
       if (data != (void*) wxLog::GetActiveTarget())
           n ++;
   }


@@ -957,9 +858,43 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   return n ;
 }
 
   return n ;
 }
 

+#if USE_THREADSAFE_MEMORY_ALLOCATION
+static bool memSectionOk = FALSE;
+
+class MemoryCriticalSection : public wxCriticalSection
+{
+public:
+       MemoryCriticalSection() {
+               memSectionOk = TRUE;
+       }
+};
+
+class MemoryCriticalSectionLocker
+{
+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
+

 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 {
 // TODO: store whether this is a vector or not.
 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 not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
 


@@ -1016,6 +951,10 @@ void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject,
 // TODO: check whether was allocated as a vector
 void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 {
 // 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 (!buf)
     return;
 


@@ -1056,9 +995,6 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
                    st->RequestSize ());
 
     (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);
 }
 
     free((char *)st);
 }
 


@@ -1140,6 +1076,8 @@ void wxTraceLevel(int, const wxChar * ...)
 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)

+// Already defined in memory.h
+#if 0

 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }
 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }


@@ -1148,4 +1086,5 @@ void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
 {
 }
 #endif
 {
 }
 #endif

+#endif