/////////////////////////////////////////////////////////////////////////////
-// Name: memory.cpp
+// Name: src/common/memory.cpp
// Purpose: Memory checking implementation
// Author: Arthur Seaton, Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "memory.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
+ #pragma hdrstop
#endif
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-// #pragma implementation
-#endif
+#include "wx/memory.h"
#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/hash.h"
+ #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
#if wxUSE_THREADS
-#include "wx/thread.h"
+ #include "wx/thread.h"
#endif
-#include "wx/log.h"
#include <stdlib.h>
#include "wx/ioswrap.h"
#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
- && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+ && !defined( __MWERKS__ )
#include <memory.h>
#endif
#include <stdarg.h>
#include <string.h>
-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#endif
-
-#include "wx/memory.h"
-
-#if wxUSE_THREADS && defined(__WXDEBUG__) && !defined(__WXMAC__)
+#if wxUSE_THREADS && defined(__WXDEBUG__)
#define USE_THREADSAFE_MEMORY_ALLOCATION 1
#else
#define USE_THREADSAFE_MEMORY_ALLOCATION 0
*/
void wxMemStruct::ErrorMsg (const char * mesg)
{
- wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
+ wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);
PrintNode ();
}
*/
void wxMemStruct::ErrorMsg ()
{
- wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
+ wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));
PrintNode ();
}
// Let's put this in standard form so IDEs can load the file at the appropriate
// line
- wxString msg(wxT(""));
+ wxString msg;
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
}
else
{
- wxString msg(wxT(""));
+ wxString msg;
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
{
wxObject *obj = (wxObject *)m_actualData;
- wxString msg(wxT(""));
+ wxString msg;
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
else
msg += wxT("unknown object class");
- wxString msg2(wxT(""));
+ wxString msg2;
msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
}
else
{
- wxString msg(wxT(""));
+ wxString msg;
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
- wxString msg2(wxT(""));
+ wxString msg2;
msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
msg += msg2;
wxDebugContext::OutputDumpLine(msg);
wxMemStruct *wxDebugContext::m_head = NULL;
wxMemStruct *wxDebugContext::m_tail = 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
#ifdef __WXDEBUG__
TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
}
#ifdef __WXDEBUG__
{
wxChar* appName = (wxChar*) wxT("application");
- wxString appNameStr(wxT(""));
+ wxString appNameStr;
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- OutputDumpLine( wxT("") );
- OutputDumpLine( wxT("") );
+ OutputDumpLine(wxEmptyString);
+ OutputDumpLine(wxEmptyString);
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
}
#ifdef __WXDEBUG__
{
wxChar* appName = (wxChar*) wxT("application");
- wxString appNameStr(wxT(""));
+ wxString appNameStr;
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
}
bool currentMode = GetDebugMode();
- SetDebugMode(FALSE);
+ SetDebugMode(false);
long noNonObjectNodes = 0;
long noObjectNodes = 0;
list = old->next;
free((char *)old);
}
- OutputDumpLine(wxT(""));
+ OutputDumpLine(wxEmptyString);
}
SetDebugMode(currentMode);
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(wxT(""));
- OutputDumpLine(wxT(""));
+ OutputDumpLine(wxEmptyString);
+ OutputDumpLine(wxEmptyString);
- return TRUE;
+ return true;
#else
(void)detailed;
- return FALSE;
+ return false;
#endif
}
{
{
wxChar* appName = (wxChar*) wxT("application");
- wxString appNameStr(wxT(""));
+ wxString appNameStr;
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
}
int n = 0;
- wxHashTable::compatibility_iterator 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->GetData();
+ info = *node;
if (info->GetClassName())
{
wxString msg(info->GetClassName());
wxLogMessage(msg);
}
- node = wxClassInfo::sm_classTable->Next();
n ++;
}
- wxLogMessage(wxT(""));
+ wxLogMessage(wxEmptyString);
wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
- wxLogMessage(wxT(""));
- wxLogMessage(wxT(""));
- return TRUE;
+ wxLogMessage(wxEmptyString);
+ wxLogMessage(wxEmptyString);
+ return true;
}
void wxDebugContext::SetCheckpoint(bool all)
int count;
va_list argptr;
va_start(argptr, szFormat);
- buf[sizeof(buf)-1] = _T('\0');
+ buf[sizeof(buf)/sizeof(wxChar)-1] = _T('\0');
// keep 3 bytes for a \r\n\0
- count = wxVsnprintf(buf, sizeof(buf)-3, szFormat, argptr);
+ count = wxVsnprintf(buf, sizeof(buf)/sizeof(wxChar)-3, szFormat, argptr);
if ( count < 0 )
- count = sizeof(buf)-3;
+ count = sizeof(buf)/sizeof(wxChar)-3;
buf[count]=_T('\r');
buf[count+1]=_T('\n');
buf[count+2]=_T('\0');
#if USE_THREADSAFE_MEMORY_ALLOCATION
-static bool memSectionOk = FALSE;
+static bool memSectionOk = false;
class MemoryCriticalSection : public wxCriticalSection
{
public:
- MemoryCriticalSection() {
- memSectionOk = TRUE;
- }
+ MemoryCriticalSection() {
+ memSectionOk = true;
+ }
+ ~MemoryCriticalSection() {
+ memSectionOk = false;
+ }
};
class MemoryCriticalSectionLocker
{
public:
inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)
- : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
+ : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
private:
MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
wxCriticalSection& m_critsect;
- bool m_locked;
+ bool m_locked;
};
static MemoryCriticalSection memLocker;
-#endif
+
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+
+
+#ifdef __WXDEBUG__
+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
+void * operator new (size_t size, wxChar * fileName, int lineNum)
+{
+ return wxDebugAlloc(size, fileName, lineNum, false, false);
+}
+
+void * operator new (size_t size)
+{
+ return wxDebugAlloc(size, NULL, 0, false);
+}
+
+void operator delete (void * buf)
+{
+ wxDebugFree(buf, false);
+}
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size)
+{
+ return wxDebugAlloc(size, NULL, 0, false, true);
+}
+
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)
+{
+ return wxDebugAlloc(size, fileName, lineNum, false, true);
+}
+
+void operator delete[] (void * buf)
+{
+ wxDebugFree(buf, true);
+}
+#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, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
free((char *)st);
}
+#endif // __WXDEBUG__
+
// Trace: send output to the current debugging stream
void wxTrace(const wxChar * ...)
{
}
//----------------------------------------------------------------------------
-// Final cleanup after all global objects in all files have been destructed
+// Final cleanup after all global objects in all files have been destroyed
//----------------------------------------------------------------------------
// Don't set it to 0 by dynamic initialization
-// Some compilers will realy do the asignment later
+// 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 wxDebugContextDumpDelayCounter::DoDump()
{
- if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+ if (wxDebugContext::CountObjectsLeft(true) > 0)
{
wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
wxDebugContext::Dump();
}
// Even if there is nothing else, make sure that there is at
-// least one clenup counter object
+// least one cleanup counter object
static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-
projects / wxWidgets.git / blobdiff