OS/2 updates for easier VA debugging

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index d7d6c07461c424535979d46dfff80402a0a11910..a1659e5bd1b3c3e0e68c3bd06ece4c983cc769b9 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -46,7 +46,8 @@
     #include <fstream>
 #endif
 
     #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
 
 #include <memory.h>
 #endif
 


@@ -110,7 +111,7 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {

-  wxLogDebug(wxT("wxWindows memory checking error: %s"), mesg);
+  wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);

   PrintNode ();
 
 //         << m_fileName << ' ' << m_lineNum << endl;
   PrintNode ();
 
 //         << m_fileName << ' ' << m_lineNum << endl;


@@ -121,7 +122,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
 */
 void wxMemStruct::ErrorMsg ()
 {

-  wxLogDebug(wxT("wxWindows over/underwrite memory error:"));
+  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));

   PrintNode ();
 
 //    cerr << m_fileName << ' ' << m_lineNum << endl;
   PrintNode ();
 
 //    cerr << m_fileName << ' ' << m_lineNum << endl;


@@ -343,7 +344,7 @@ void wxMemStruct::PrintNode ()
     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;
 

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
   else
   {
   }
   else
   {


@@ -356,7 +357,7 @@ void wxMemStruct::PrintNode ()
     msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
     msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
 }
 
   }
 }
 


@@ -389,7 +390,7 @@ void wxMemStruct::Dump ()
     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;
 

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
   else
   {
   }
   else
   {


@@ -400,7 +401,7 @@ void wxMemStruct::Dump ()
     wxString msg2("");
     msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
     wxString msg2("");
     msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;

-    wxLogDebug(msg);
+    wxLogMessage(msg);

   }
 }
 
   }
 }
 


@@ -418,7 +419,7 @@ int wxMemStruct::ValidateNode ()
         else {
             // Can't use the error routines as we have no recognisable object.
 #ifndef __WXGTK__
         else {
             // Can't use the error routines as we have no recognisable object.
 #ifndef __WXGTK__

-             wxLogDebug(wxT("Can't verify memory struct - all bets are off!"));
+             wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));

 #endif
         }
         return 0;
 #endif
         }
         return 0;


@@ -472,6 +473,11 @@ int wxDebugContext::debugLevel = 1;
 bool wxDebugContext::debugOn = TRUE;
 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
 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;
 wxDebugContext::wxDebugContext(void)
 {
 //  m_streamBuf = new wxDebugStreamBuf;


@@ -513,7 +519,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf)
 
 bool wxDebugContext::SetFile(const wxString& file)
 {
 
 bool wxDebugContext::SetFile(const wxString& file)
 {

-  ofstream *str = new ofstream(file.fn_str());
+  ofstream *str = new ofstream(file.mb_str());

 
   if (str->bad())
   {
 
   if (str->bad())
   {


@@ -595,6 +601,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!
 
   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)
 {
 */
 size_t wxDebugContext::GetPadding (const size_t size)
 {


@@ -602,11 +611,22 @@ size_t wxDebugContext::GetPadding (const size_t size)
     return (pad) ? sizeof(wxMarkerType) - pad : 0;
 }
 
     return (pad) ? sizeof(wxMarkerType) - pad : 0;
 }
 

-
-

 size_t wxDebugContext::PaddedSize (const size_t size)
 {
 size_t wxDebugContext::PaddedSize (const size_t 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);
+
+// Old (slow) code
+#if 0

     return size + GetPadding (size);
     return size + GetPadding (size);

+#endif

 }
 
 /*
 }
 
 /*


@@ -629,7 +649,8 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
   if (!from)
     from = wxDebugContext::GetHead ();
 
   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))
   {
       void* data = st->GetActualData();
 //      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))


@@ -672,17 +693,17 @@ bool wxDebugContext::Dump(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;

-        wxLogDebug(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

-      wxLogDebug( wxT("----- Memory dump -----") );
+      wxLogMessage( wxT("----- Memory dump -----") );

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

-  wxLogDebug( wxT("") );
-  wxLogDebug( wxT("") );
+  wxLogMessage( wxT("") );
+  wxLogMessage( wxT("") );

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -729,11 +750,11 @@ bool wxDebugContext::PrintStatistics(bool detailed)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;

-        wxLogDebug(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+        wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );

     }
     else
     {
     }
     else
     {

-      wxLogDebug( wxT("----- Memory statistics -----") );
+      wxLogMessage( wxT("----- Memory statistics -----") );

     }
   }
 
     }
   }
 


@@ -792,22 +813,22 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     while (list)
     {
   {
     while (list)
     {

-      wxLogDebug(wxT("%ld objects of class %s, total size %ld"),
+      wxLogMessage(wxT("%ld objects of class %s, total size %ld"),

           list->instanceCount, list->instanceClass, list->totalSize);
       wxDebugStatsStruct *old = list;
       list = old->next;
       free((char *)old);
     }
           list->instanceCount, list->instanceClass, list->totalSize);
       wxDebugStatsStruct *old = list;
       list = old->next;
       free((char *)old);
     }

-    wxLogDebug(wxT(""));
+    wxLogMessage(wxT(""));

   }
 
   SetDebugMode(currentMode);
 
   }
 
   SetDebugMode(currentMode);
 

-  wxLogDebug(wxT("Number of object items: %ld"), noObjectNodes);
-  wxLogDebug(wxT("Number of non-object items: %ld"), noNonObjectNodes);
-  wxLogDebug(wxT("Total allocated size: %ld"), totalSize);
-  wxLogDebug(wxT(""));
-  wxLogDebug(wxT(""));
+  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(""));

 
   return TRUE;
 #else
 
   return TRUE;
 #else


@@ -828,7 +849,7 @@ bool wxDebugContext::PrintClasses(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;

-        wxLogDebug(wxT("----- Classes in %s -----"), appName);
+        wxLogMessage(wxT("----- Classes in %s -----"), appName);

     }
   }
 
     }
   }
 


@@ -861,15 +882,15 @@ bool wxDebugContext::PrintClasses(void)
         if (info->GetConstructor())
             msg += wxT(": dynamic");
 
         if (info->GetConstructor())
             msg += wxT(": dynamic");
 

-        wxLogDebug(msg);
+        wxLogMessage(msg);

     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }
     }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }

-  wxLogDebug(wxT(""));
-  wxLogDebug(wxT("There are %d classes derived from wxObject."), n);
-  wxLogDebug(wxT(""));
-  wxLogDebug(wxT(""));
+  wxLogMessage(wxT(""));
+  wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
+  wxLogMessage(wxT(""));
+  wxLogMessage(wxT(""));

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -924,110 +945,6 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
   return n ;
 }
 
   return n ;
 }
 

-/*
-  The global operator new used for everything apart from getting
-  dynamic storage within this function itself.
-*/
-
-// 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
-
-#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, wxChar * fileName, int lineNum)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
-#endif
-}
-
-// Added JACS 25/11/98
-void * operator new (size_t size)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, NULL, 0, FALSE);
-#endif
-}
-
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
-#endif
-}
-#endif
-
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size, wxChar * fileName, int lineNum)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  return malloc(size);
-#else
-  return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
-#endif
-}
-#endif
-
-#if !defined(__VISAGECPP__) // already defines this by default
-void operator delete (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf);
-#endif
-}
-#endif
-
-// VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
-{
-// ::operator delete(pData);
-  // JACS 21/11/1998: surely we need to call wxDebugFree?
-  wxDebugFree(pData, FALSE);
-}
-// New operator 21/11/1998
-void operator delete[](void* pData, char* /* fileName */, int /* lineNum */)
-{
-  wxDebugFree(pData, TRUE);
-}
-#endif
-
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-
-void operator delete[] (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
-  free((char*) buf);
-#else
-  wxDebugFree(buf, TRUE);
-#endif
-}
-#endif
-
-#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) )
 {


@@ -1042,7 +959,7 @@ void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject,
     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {
     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {

-        wxLogDebug(wxT("Call to malloc (%ld) failed."), (long)size);
+        wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);

         return 0;
     }
     wxMemStruct * st = (wxMemStruct *)buf;
         return 0;
     }
     wxMemStruct * st = (wxMemStruct *)buf;


@@ -1128,7 +1045,10 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar *fmt ...)
 {
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar *fmt ...)
 {

-  va_list ap;
+#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);
   static wxChar buffer[512];
 
   va_start(ap, fmt);


@@ -1156,11 +1076,15 @@ void wxTrace(const wxChar *fmt ...)
 #else
     fprintf(stderr, buffer);
 #endif
 #else
     fprintf(stderr, buffer);
 #endif

+#endif

 }
 
 // Trace with level
 void wxTraceLevel(int level, const wxChar *fmt ...)
 {
 }
 
 // Trace with level
 void wxTraceLevel(int level, const wxChar *fmt ...)
 {

+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else

   if (wxDebugContext::GetLevel() < level)
     return;
 
   if (wxDebugContext::GetLevel() < level)
     return;
 


@@ -1170,7 +1094,7 @@ void wxTraceLevel(int level, const wxChar *fmt ...)
   va_start(ap, fmt);
 
 #ifdef __WXMSW__
   va_start(ap, fmt);
 
 #ifdef __WXMSW__

-  wvsprintf(buffer,fmt,ap) ;
+  wxWvsprintf(buffer,fmt,ap) ;

 #else
   vsprintf(buffer,fmt,ap) ;
 #endif
 #else
   vsprintf(buffer,fmt,ap) ;
 #endif


@@ -1192,6 +1116,7 @@ void wxTraceLevel(int level, const wxChar *fmt ...)
 #else
     fprintf(stderr, buffer);
 #endif
 #else
     fprintf(stderr, buffer);
 #endif

+#endif

 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)