X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bd5bbc948bd22c5a0edde9e35e4995c919f593b..f5ba273ecd799f652736ce2bc830283787302a56:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 0f51b89b6d..9730edb82d 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -35,7 +35,7 @@
 #include "wx/app.h"
 #endif
 
-#include <wx/log.h>
+#include "wx/log.h"
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
@@ -46,7 +46,8 @@
     #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
 
@@ -110,7 +111,7 @@
 */
 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;
@@ -121,7 +122,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
-  wxLogDebug(wxT("wxWindows over/underwrite memory error:"));
+  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
   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;
 
-    wxLogDebug(msg);
+    wxLogMessage(msg);
   }
   else
   {
@@ -356,7 +357,7 @@ void wxMemStruct::PrintNode ()
     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;
 
-    wxLogDebug(msg);
+    wxLogMessage(msg);
   }
   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;
-    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__
-             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;
@@ -472,6 +473,11 @@ int wxDebugContext::debugLevel = 1;
 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;
@@ -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!
+
+  // 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 +611,22 @@ size_t wxDebugContext::GetPadding (const size_t size)
     return (pad) ? sizeof(wxMarkerType) - pad : 0;
 }
 
-
-
 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);
+#endif
 }
 
 /*
@@ -672,17 +692,17 @@ bool wxDebugContext::Dump(void)
     {
         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
     {
-      wxLogDebug( wxT("----- Memory dump -----") );
+      wxLogMessage( wxT("----- Memory dump -----") );
     }
   }
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
-  wxLogDebug( wxT("") );
-  wxLogDebug( wxT("") );
+  wxLogMessage( wxT("") );
+  wxLogMessage( wxT("") );
 
   return TRUE;
 #else
@@ -729,11 +749,11 @@ bool wxDebugContext::PrintStatistics(bool detailed)
     {
         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
     {
-      wxLogDebug( wxT("----- Memory statistics -----") );
+      wxLogMessage( wxT("----- Memory statistics -----") );
     }
   }
 
@@ -792,22 +812,22 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   {
     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);
     }
-    wxLogDebug(wxT(""));
+    wxLogMessage(wxT(""));
   }
 
   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
@@ -828,7 +848,7 @@ bool wxDebugContext::PrintClasses(void)
     {
         appNameStr = wxTheApp->GetAppName();
         appName = WXSTRINGCAST appNameStr;
-        wxLogDebug(wxT("----- Classes in %s -----"), appName);
+        wxLogMessage(wxT("----- Classes in %s -----"), appName);
     }
   }
 
@@ -861,15 +881,15 @@ bool wxDebugContext::PrintClasses(void)
         if (info->GetConstructor())
             msg += wxT(": dynamic");
 
-        wxLogDebug(msg);
+        wxLogMessage(msg);
     }
     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;
 }
 
@@ -1003,8 +1023,6 @@ void operator delete (void * buf)
 #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
@@ -1042,7 +1060,7 @@ void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject,
     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;