// 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
#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"
+#include "wx/hash.h"
+#endif
+
+#if wxUSE_THREADS
+#include "wx/thread.h"
#endif
#include "wx/log.h"
#include "wx/ioswrap.h"
-#if wxUSE_IOSTREAMH
- #include <fstream.h>
-#else
- #include <fstream>
-#endif
-
#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
&& !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <memory.h>
#include <string.h>
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#ifdef GetClassInfo
#undef GetClassInfo
#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
{
wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
PrintNode ();
-
-// << m_fileName << ' ' << m_lineNum << endl;
}
/*
{
wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
PrintNode ();
-
-// cerr << m_fileName << ' ' << m_lineNum << endl;
}
}
else
{
- wxString msg("");
+ wxString msg(wxT(""));
if (m_fileName)
msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
else
msg += wxT("unknown object class");
- wxString msg2("");
+ wxString msg2(wxT(""));
msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
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);
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
-wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
-wxSTD ostream *wxDebugContext::m_debugStream = NULL;
bool wxDebugContext::m_checkPrevious = FALSE;
int wxDebugContext::debugLevel = 1;
wxDebugContext::wxDebugContext(void)
{
-// m_streamBuf = new wxDebugStreamBuf;
-// m_debugStream = new wxSTD 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.
- */
-
-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;
}
-
/*
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
return(size + m_balign - padb);
else
return(size);
-
-// Old (slow) code
-#if 0
- return size + GetPadding (size);
-#endif
}
/*
bool wxDebugContext::PrintList (void)
{
#ifdef __WXDEBUG__
-// if (!HasStream())
-// return FALSE;
-
TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
return TRUE;
bool wxDebugContext::Dump(void)
{
#ifdef __WXDEBUG__
-// if (!HasStream())
-// return FALSE;
-
-// if (TRUE)
{
- wxChar* appName = wxT("application");
- wxString appNameStr("");
+ wxChar* appName = (wxChar*) wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
wxLogMessage( wxT("----- Memory dump -----") );
}
}
+
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
wxLogMessage( wxT("") );
bool wxDebugContext::PrintStatistics(bool detailed)
{
#ifdef __WXDEBUG__
-// if (!HasStream())
-// return FALSE;
-
-// if (TRUE)
{
- wxChar* appName = wxT("application");
+ wxChar* appName = (wxChar*) wxT("application");
wxString appNameStr(wxT(""));
if (wxTheApp)
{
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 = wxT("nonobject");
+ wxChar *className = (wxChar*) wxT("nonobject");
if (st->m_isObject && st->GetActualData())
{
wxObject *obj = (wxObject *)st->GetActualData();
stats->totalSize += st->RequestSize();
}
-// if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
if (data != (void*) wxLog::GetActiveTarget())
{
totalSize += st->RequestSize();
bool wxDebugContext::PrintClasses(void)
{
-// if (!HasStream())
-// return FALSE;
-
-// if (TRUE)
{
- wxChar* appName = wxT("application");
+ wxChar* appName = (wxChar*) wxT("application");
wxString appNameStr(wxT(""));
if (wxTheApp)
{
}
int n = 0;
- wxNode *node;
+ wxHashTable::compatibility_iterator 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());
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 ;
}
+#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) )
{
+#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.
// 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;
(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);
}
#endif
}
-#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
-void wxTrace(const char *WXUNUSED(fmt) ...)
-{
-}
-
-void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
-{
-}
#endif
projects / wxWidgets.git / blobdiff