/////////////////////////////////////////////////////////////////////////////
-// Name: memory.cpp
+// Name: src/common/memory.cpp
// Purpose: Memory checking implementation
// Author: Arthur Seaton, Julian Smart
// 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__
-#pragma implementation "memory.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
+#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#include "wx/memory.h"
-#ifdef __GNUG__
-// #pragma implementation
+#ifndef WX_PRECOMP
+ #ifdef __WXMSW__
+ #include "wx/msw/wrapwin.h"
+ #endif
+ #include "wx/utils.h"
+ #include "wx/app.h"
+ #include "wx/hash.h"
+ #include "wx/log.h"
#endif
-#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/app.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__ )
#include <memory.h>
#endif
#include <stdarg.h>
#include <string.h>
-#ifdef __WXMSW__
-#include <windows.h>
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
+#if wxUSE_THREADS
+#define USE_THREADSAFE_MEMORY_ALLOCATION 1
+#else
+#define USE_THREADSAFE_MEMORY_ALLOCATION 0
#endif
-#include "wx/memory.h"
#ifdef new
#undef new
*/
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;
}
/*
*/
void wxMemStruct::ErrorMsg ()
{
- wxLogDebug("wxWindows over/underwrite memory error:");
+ wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));
PrintNode ();
-
-// cerr << m_fileName << ' ' << m_lineNum << endl;
}
// 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);
}
}
{
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.
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.c_str());
}
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.c_str());
}
}
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;
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;
-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.
- */
+// 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;
-void wxDebugContext::SetStream(ostream *str, streambuf *buf)
-{
- if (m_debugStream)
- {
- m_debugStream->flush();
- delete m_debugStream;
- }
- m_debugStream = NULL;
+// Pointer to global function to call at shutdown
+wxShutdownNotifyFunction wxDebugContext::sm_shutdownFn;
- // 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)
+wxDebugContext::wxDebugContext(void)
{
- ofstream *str = new ofstream((char *) (const char *)file);
-
- if (str->bad())
- {
- delete str;
- return FALSE;
- }
- else
- {
- SetStream(str);
- return TRUE;
- }
}
-bool wxDebugContext::SetStandardError(void)
+wxDebugContext::~wxDebugContext(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
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)
{
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);
}
/*
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))
*/
bool wxDebugContext::PrintList (void)
{
-#ifdef __WXDEBUG__
-// if (!HasStream())
-// return FALSE;
-
- TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+ TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : NULL));
- return TRUE;
-#else
- return FALSE;
-#endif
+ return true;
}
bool wxDebugContext::Dump(void)
{
-#ifdef __WXDEBUG__
-// if (!HasStream())
-// return FALSE;
-
- if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ const wxChar* appName = 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 = appNameStr.c_str();
+ OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));
}
else
{
- wxLogDebug( "----- Memory dump -----" );
+ OutputDumpLine( wxT("----- Memory dump -----") );
}
}
- TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- wxLogDebug( "" );
- wxLogDebug( "" );
+ TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : NULL));
- return TRUE;
-#else
- return FALSE;
-#endif
+ OutputDumpLine(wxEmptyString);
+ OutputDumpLine(wxEmptyString);
+
+ return true;
}
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;
}
bool wxDebugContext::PrintStatistics(bool detailed)
{
-#ifdef __WXDEBUG__
-// if (!HasStream())
-// return FALSE;
-
- if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ const wxChar* appName = 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 = appNameStr.c_str();
+ OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));
}
else
{
- wxLogDebug( "----- Memory statistics -----" );
+ OutputDumpLine( wxT("----- Memory statistics -----") );
}
}
bool currentMode = GetDebugMode();
- SetDebugMode(FALSE);
+ SetDebugMode(false);
long noNonObjectNodes = 0;
long noObjectNodes = 0;
wxDebugStatsStruct *list = NULL;
- wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+ wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );
if (!from)
from = wxDebugContext::GetHead ();
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)
stats->totalSize += st->RequestSize();
}
-// if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
if (data != (void*) wxLog::GetActiveTarget())
{
totalSize += st->RequestSize();
{
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;
-#else
- return FALSE;
-#endif
+ return true;
}
bool wxDebugContext::PrintClasses(void)
{
-// if (!HasStream())
-// return FALSE;
-
- if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ const wxChar* appName = wxT("application");
+ wxString appNameStr;
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxLogDebug("----- Classes in %s -----", appName);
+ appName = appNameStr.c_str();
+ wxLogMessage(wxT("----- Classes in %s -----"), appName);
}
}
int n = 0;
- wxNode *node;
- wxClassInfo *info;
+ const wxClassInfo *info;
- wxClassInfo::sm_classTable->BeginFind();
- node = wxClassInfo::sm_classTable->Next();
- while (node)
+ for (wxClassInfo::const_iterator node = wxClassInfo::begin_classinfo(),
+ end = wxClassInfo::end_classinfo();
+ node != end; ++node)
{
- info = (wxClassInfo *)node->Data();
+ info = *node;
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)
{
int nFailures = 0;
- wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+ wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );
if (!from || checkAll)
from = wxDebugContext::GetHead ();
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 ++;
}
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.
+// 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[WXSIZEOF(buf)-1] = wxT('\0');
+
+ // keep 3 bytes for a \r\n\0
+ count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr);
+
+ if ( count < 0 )
+ count = WXSIZEOF(buf)-3;
+ buf[count]=wxT('\r');
+ buf[count+1]=wxT('\n');
+ buf[count+2]=wxT('\0');
+
+ wxMessageOutputDebug dbgout;
+ dbgout.Printf(buf);
+}
-#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
+void wxDebugContext::SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn)
+{
+ sm_shutdownFn = shutdownFn;
+}
-#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
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+static bool memSectionOk = false;
-// 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);
-#endif
-}
+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;
+};
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size)
+static MemoryCriticalSection memLocker;
+
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+
+
+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
+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
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
// 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);
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;
// 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())
(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);
}
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
}
else
#ifdef __WXMSW__
- OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+ OutputDebugString((LPCTSTR)buffer) ;
+#else
+ OutputDebugString((const char*) buffer) ;
+#endif
#else
fprintf(stderr, buffer);
#endif
+#endif
+}
+
+//----------------------------------------------------------------------------
+// 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;
+
+wxDebugContextDumpDelayCounter::wxDebugContextDumpDelayCounter()
+{
+ sm_count++;
}
-#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
-void wxTrace(const char *WXUNUSED(fmt) ...)
+wxDebugContextDumpDelayCounter::~wxDebugContextDumpDelayCounter()
{
+ if ( !--sm_count )
+ {
+ // Notify app if we've been asked to do that
+ if( wxDebugContext::sm_shutdownFn )
+ wxDebugContext::sm_shutdownFn();
+ DoDump();
+ }
}
-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 // wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT
projects / wxWidgets.git / blobdiff