// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/defs.h"
#endif
-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#ifdef __GNUG__
// #pragma implementation
#include "wx/app.h"
#endif
+#include "wx/log.h"
#include <stdlib.h>
+#include "wx/ioswrap.h"
+
#if wxUSE_IOSTREAMH
-#include <iostream.h>
+ #include <fstream.h>
#else
-#include <iostream>
+ #include <fstream>
#endif
-#include <fstream.h>
-#if !defined(__WATCOMC__) && !defined(__VMS__)
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
+ && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <memory.h>
#endif
// wxDebugContext wxTheDebugContext;
/*
Redefine new and delete so that we can pick up situations where:
- - we overwrite or underwrite areas of malloc'd memory.
- - we use uninitialise variables
+ - we overwrite or underwrite areas of malloc'd memory.
+ - we use uninitialise variables
Only do this in debug mode.
We change new to get enough memory to allocate a struct, followed
*/
void wxMemStruct::ErrorMsg (const char * mesg)
{
- wxTrace("wxWindows memory checking error: %s\n", mesg);
+ wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
PrintNode ();
-// << m_fileName << ' ' << m_lineNum << endl;
+// << m_fileName << ' ' << m_lineNum << endl;
}
/*
*/
void wxMemStruct::ErrorMsg ()
{
- wxTrace("wxWindows over/underwrite memory error: \n");
+ wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
PrintNode ();
-
+
// cerr << m_fileName << ' ' << m_lineNum << endl;
}
int wxMemStruct::AssertList ()
{
if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
- wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
- ErrorMsg ("Head or tail pointers trashed");
- return 0;
+ wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+ ErrorMsg ("Head or tail pointers trashed");
+ return 0;
}
return 1;
}
int wxMemStruct::AssertIt ()
{
return (m_id == MemStructId &&
- (m_prev == 0 || m_prev->m_id == MemStructId) &&
- (m_next == 0 || m_next->m_id == MemStructId));
+ (m_prev == 0 || m_prev->m_id == MemStructId) &&
+ (m_next == 0 || m_next->m_id == MemStructId));
}
int wxMemStruct::Append ()
{
if (! AssertList ())
- return 0;
+ return 0;
if (wxDebugContext::GetHead () == 0) {
- if (wxDebugContext::GetTail () != 0) {
- ErrorMsg ("Null list should have a null tail pointer");
- return 0;
- }
- (void) wxDebugContext::SetHead (this);
- (void) wxDebugContext::SetTail (this);
+ if (wxDebugContext::GetTail () != 0) {
+ ErrorMsg ("Null list should have a null tail pointer");
+ return 0;
+ }
+ (void) wxDebugContext::SetHead (this);
+ (void) wxDebugContext::SetTail (this);
} else {
- wxDebugContext::GetTail ()->m_next = this;
- this->m_prev = wxDebugContext::GetTail ();
- (void) wxDebugContext::SetTail (this);
+ wxDebugContext::GetTail ()->m_next = this;
+ this->m_prev = wxDebugContext::GetTail ();
+ (void) wxDebugContext::SetTail (this);
}
return 1;
}
int wxMemStruct::Unlink ()
{
if (! AssertList ())
- return 0;
+ return 0;
if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) {
- ErrorMsg ("Trying to remove node from empty list");
- return 0;
+ ErrorMsg ("Trying to remove node from empty list");
+ return 0;
}
// Handle the part of the list before this node.
if (m_prev == 0) {
- if (this != wxDebugContext::GetHead ()) {
- ErrorMsg ("No previous node for non-head node");
- return 0;
- }
- (void) wxDebugContext::SetHead (m_next);
+ if (this != wxDebugContext::GetHead ()) {
+ ErrorMsg ("No previous node for non-head node");
+ return 0;
+ }
+ (void) wxDebugContext::SetHead (m_next);
} else {
- if (! m_prev->AssertIt ()) {
- ErrorMsg ("Trashed previous pointer");
- return 0;
- }
-
- if (m_prev->m_next != this) {
- ErrorMsg ("List is inconsistent");
- return 0;
- }
- m_prev->m_next = m_next;
+ if (! m_prev->AssertIt ()) {
+ ErrorMsg ("Trashed previous pointer");
+ return 0;
+ }
+
+ if (m_prev->m_next != this) {
+ ErrorMsg ("List is inconsistent");
+ return 0;
+ }
+ m_prev->m_next = m_next;
}
// Handle the part of the list after this node.
if (m_next == 0) {
- if (this != wxDebugContext::GetTail ()) {
- ErrorMsg ("No next node for non-tail node");
- return 0;
- }
- (void) wxDebugContext::SetTail (m_prev);
+ if (this != wxDebugContext::GetTail ()) {
+ ErrorMsg ("No next node for non-tail node");
+ return 0;
+ }
+ (void) wxDebugContext::SetTail (m_prev);
} else {
- if (! m_next->AssertIt ()) {
- ErrorMsg ("Trashed next pointer");
- return 0;
- }
-
- if (m_next->m_prev != this) {
- ErrorMsg ("List is inconsistent");
- return 0;
- }
- m_next->m_prev = m_prev;
+ if (! m_next->AssertIt ()) {
+ ErrorMsg ("Trashed next pointer");
+ return 0;
+ }
+
+ if (m_next->m_prev != this) {
+ ErrorMsg ("List is inconsistent");
+ return 0;
+ }
+ m_next->m_prev = m_prev;
}
return 1;
int nFailures = 0;
if (m_firstMarker != MemStartCheck) {
- nFailures++;
- ErrorMsg ();
+ nFailures++;
+ ErrorMsg ();
}
-
+
char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
if (* (wxMarkerType *) pointer != MemMidCheck) {
- nFailures++;
- ErrorMsg ();
+ nFailures++;
+ ErrorMsg ();
}
-
+
pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
if (* (wxMarkerType *) pointer != MemEndCheck) {
- nFailures++;
- ErrorMsg ();
+ nFailures++;
+ ErrorMsg ();
}
-
+
return nFailures;
}
int wxMemStruct::CheckAllPrevious ()
{
int nFailures = 0;
-
+
for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {
- if (st->AssertIt ())
- nFailures += st->CheckBlock ();
- else
- return -1;
+ if (st->AssertIt ())
+ nFailures += st->CheckBlock ();
+ else
+ return -1;
}
return nFailures;
wxObject *obj = (wxObject *)m_actualData;
wxClassInfo *info = obj->GetClassInfo();
+ // Let's put this in standard form so IDEs can load the file at the appropriate
+ // line
+ wxString msg(wxT(""));
+
+ if (m_fileName)
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
if (info && info->GetClassName())
- wxTrace("%s", info->GetClassName());
+ msg += info->GetClassName();
else
- wxTrace("Object");
+ msg += wxT("object");
- if (m_fileName)
- wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
+ wxString msg2;
+ msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+ msg += msg2;
- wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+ wxLogMessage(msg);
}
else
{
- wxTrace("Non-object data");
+ wxString msg("");
+
if (m_fileName)
- wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
- wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+ msg += wxT("non-object data");
+ wxString msg2;
+ msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
+ msg += msg2;
+
+ wxLogMessage(msg);
}
}
void wxMemStruct::Dump ()
{
if (!ValidateNode()) return;
-
+
if (m_isObject)
{
wxObject *obj = (wxObject *)m_actualData;
-// wxClassInfo *info = obj->GetClassInfo();
+ wxString msg(wxT(""));
if (m_fileName)
- wxTrace("Item (%s %d)", m_fileName, (int)m_lineNum);
- else
- wxTrace("Item");
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
- wxTrace(" at $%lX, size %d: ", (long)GetActualData(), (int)RequestSize());
-// wxTrace(info->GetClassName());
+ /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
+ * Instead, do what wxObject::Dump does.
+ * What should we do long-term, eliminate Dumping? Or specify
+ * that MyClass::Dump should use wxLogDebug? Ugh.
obj->Dump(wxDebugContext::GetStream());
- wxTrace("\n");
+ */
+
+ if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
+ msg += obj->GetClassInfo()->GetClassName();
+ else
+ msg += wxT("unknown object class");
+
+ wxString msg2("");
+ msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+ msg += msg2;
+
+ wxLogMessage(msg);
}
else
{
- wxTrace("Non-object data");
+ wxString msg(wxT(""));
if (m_fileName)
- wxTrace(" (%s %d)", m_fileName, (int)m_lineNum);
- wxTrace(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
+ wxString msg2("");
+ msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
+ msg += msg2;
+ wxLogMessage(msg);
}
}
{
char * startPointer = (char *) this;
if (!AssertIt ()) {
- if (IsDeleted ())
- ErrorMsg ("Object already deleted");
- else {
- // Can't use the error routines as we have no recognisable object.
+ if (IsDeleted ())
+ ErrorMsg ("Object already deleted");
+ else {
+ // Can't use the error routines as we have no recognisable object.
#ifndef __WXGTK__
- wxTrace("Can't verify memory struct - all bets are off!\n");
+ wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));
#endif
- }
- return 0;
+ }
+ return 0;
}
/*
if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
ErrorMsg ();
if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
- RequestSize ()) !=
- MemEndCheck)
+ RequestSize ()) !=
+ MemEndCheck)
ErrorMsg ();
// Back to before the extra buffer and check that
// we can still read what we originally wrote.
if (Marker () != MemStartCheck ||
- * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
- != MemMidCheck ||
- * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
- RequestSize ()) != MemEndCheck)
+ * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
+ != MemMidCheck ||
+ * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
+ RequestSize ()) != MemEndCheck)
{
- ErrorMsg ();
- return 0;
+ ErrorMsg ();
+ return 0;
}
return 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;
void wxDebugContext::SetStream(ostream *str, streambuf *buf)
{
-/*
- if (str)
- {
- char buff[128];
- sprintf(buff, "SetStream (1): str is %ld", (long) str);
- MessageBox(NULL, buff, "Memory", MB_OK);
- }
-*/
-
if (m_debugStream)
{
m_debugStream->flush();
bool wxDebugContext::SetFile(const wxString& file)
{
- ofstream *str = new ofstream((char *) (const char *)file);
+ ofstream *str = new ofstream(file.mb_str());
if (str->bad())
{
}
else
{
-/*
- char buf[40];
- sprintf(buf, "SetFile: str is %ld", (long) str);
- MessageBox(NULL, buf, "Memory", MB_OK);
-*/
SetStream(str);
return TRUE;
}
bool wxDebugContext::SetStandardError(void)
{
+ // Obsolete
+#if 0
#if !defined(_WINDLL)
wxDebugStreamBuf *buf = new wxDebugStreamBuf;
ostream *stream = new ostream(m_streamBuf);
#else
return FALSE;
#endif
+#endif
+ return FALSE;
}
char * wxDebugContext::StartPos (const char * caller)
{
return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -
- wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
+ wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
}
/*
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)
{
+ // 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
}
/*
size_t wxDebugContext::TotSize (const size_t reqSize)
{
return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +
- 2 * sizeof(wxMarkerType));
+ 2 * sizeof(wxMarkerType));
}
{
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))
+// if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+ if (data != (void*) wxLog::GetActiveTarget())
{
(st->*func) ();
}
*/
bool wxDebugContext::PrintList (void)
{
-#if WXDEBUG
- if (!HasStream())
- return FALSE;
+#ifdef __WXDEBUG__
+// if (!HasStream())
+// return FALSE;
TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
bool wxDebugContext::Dump(void)
{
-#if WXDEBUG
- if (!HasStream())
- return FALSE;
+#ifdef __WXDEBUG__
+// if (!HasStream())
+// return FALSE;
- if (TRUE)
+// if (TRUE)
{
- char* appName = "application";
+ wxChar* appName = wxT("application");
wxString appNameStr("");
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxTrace("----- Memory dump of %s at %s -----\n", appName, WXSTRINGCAST wxNow() );
+ appName = WXSTRINGCAST appNameStr;
+ wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxTrace( "----- Memory dump -----\n" );
+ wxLogMessage( wxT("----- Memory dump -----") );
}
}
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
-
- wxTrace( "\n\n" );
+
+ wxLogMessage( wxT("") );
+ wxLogMessage( wxT("") );
return TRUE;
#else
{
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)
{
-#if WXDEBUG
- if (!HasStream())
- return FALSE;
+#ifdef __WXDEBUG__
+// if (!HasStream())
+// return FALSE;
- if (TRUE)
+// if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ wxChar* appName = wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxTrace("----- Memory statistics of %s at %s -----\n", appName, WXSTRINGCAST wxNow() );
+ appName = WXSTRINGCAST appNameStr;
+ wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxTrace( "----- Memory statistics -----\n" );
+ wxLogMessage( wxT("----- Memory statistics -----") );
}
}
-
+
bool currentMode = GetDebugMode();
SetDebugMode(FALSE);
-
+
long noNonObjectNodes = 0;
long noObjectNodes = 0;
long totalSize = 0;
if (!from)
from = wxDebugContext::GetHead ();
- wxMemStruct *st;
+ wxMemStruct *st;
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*)m_debugStream) && (data != (void*) m_streamBuf))
+ if (detailed && (data != (void*) wxLog::GetActiveTarget()))
{
- char *className = "nonobject";
+ wxChar *className = 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*)m_debugStream) && (data != (void*) m_streamBuf))
+ if (data != (void*) wxLog::GetActiveTarget())
{
totalSize += st->RequestSize();
if (st->m_isObject)
{
while (list)
{
- wxTrace("%ld objects of class %s, total size %ld\n",
+ 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);
}
- wxTrace("\n");
+ wxLogMessage(wxT(""));
}
-
+
SetDebugMode(currentMode);
- wxTrace("Number of object items: %ld\n", noObjectNodes);
- wxTrace("Number of non-object items: %ld\n", noNonObjectNodes);
- wxTrace("Total allocated size: %ld\n", totalSize);
- wxTrace("\n\n");
+ 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 FALSE;
#endif
-}
+}
bool wxDebugContext::PrintClasses(void)
{
- if (!HasStream())
- return FALSE;
+// if (!HasStream())
+// return FALSE;
- if (TRUE)
+// if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ wxChar* appName = wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxTrace("----- Classes in %s -----\n", appName);
+ appName = WXSTRINGCAST appNameStr;
+ wxLogMessage(wxT("----- Classes in %s -----"), appName);
}
}
info = (wxClassInfo *)node->Data();
if (info->GetClassName())
{
- wxTrace("%s ", info->GetClassName());
-
- if (info->GetBaseClassName1() && !info->GetBaseClassName2())
- wxTrace("is a %s", info->GetBaseClassName1());
- else if (info->GetBaseClassName1() && info->GetBaseClassName2())
- wxTrace("is a %s, %s", info->GetBaseClassName1(), info->GetBaseClassName2());
- if (info->GetConstructor())
- wxTrace(": dynamic\n");
- else
- wxTrace("\n");
+ wxString msg(info->GetClassName());
+ msg += wxT(" ");
+
+ if (info->GetBaseClassName1() && !info->GetBaseClassName2())
+ {
+ msg += wxT("is a ");
+ msg += info->GetBaseClassName1();
+ }
+ else if (info->GetBaseClassName1() && info->GetBaseClassName2())
+ {
+ msg += wxT("is a ");
+ msg += info->GetBaseClassName1() ;
+ msg += wxT(", ");
+ msg += info->GetBaseClassName2() ;
+ }
+ if (info->GetConstructor())
+ msg += wxT(": dynamic");
+
+ wxLogMessage(msg);
}
node = wxClassInfo::sm_classTable->Next();
n ++;
}
- wxTrace("\nThere are %d classes derived from wxObject.\n\n\n", n);
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT(""));
return TRUE;
-}
+}
void wxDebugContext::SetCheckpoint(bool all)
{
int wxDebugContext::Check(bool checkAll)
{
int nFailures = 0;
-
+
wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
if (!from || checkAll)
from = wxDebugContext::GetHead ();
// Count the number of non-wxDebugContext-related objects
// that are outstanding
-int wxDebugContext::CountObjectsLeft(void)
+int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
{
int n = 0;
-
- wxMemStruct *from = wxDebugContext::GetHead ();
+
+ wxMemStruct *from = NULL;
+ if (sinceCheckpoint && checkPoint)
+ from = checkPoint->m_next;
+ else
+ 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*)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.
-
-#if 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 _MSC_VER
-#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, char * fileName, int lineNum)
-{
-#ifdef NO_DEBUG_ALLOCATION
- return malloc(size);
-#else
- return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
-#endif
-}
-
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-void * operator new[] (size_t size, char * fileName, int lineNum)
-{
-#ifdef NO_DEBUG_ALLOCATION
- return malloc(size);
-#else
- return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
-#endif
-}
-#endif
-
-void operator delete (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
- free((char*) buf);
-#else
- wxDebugFree(buf);
-#endif
-}
-
-// VC++ 6.0
-#if _MSC_VER >= 1200
-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
-{
- ::operator delete(pData);
-}
-#endif
-
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-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, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
+void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
{
// 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);
}
-
- char * buf = (char *) malloc(wxDebugContext::TotSize (size));
+
+ int totSize = wxDebugContext::TotSize (size);
+ char * buf = (char *) malloc(totSize);
if (!buf) {
- wxTrace("Call to malloc (%ld) failed.\n", (long)size);
- return 0;
+ wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);
+ return 0;
}
wxMemStruct * st = (wxMemStruct *)buf;
st->m_firstMarker = MemStartCheck;
// Errors from Append() shouldn't really happen - but just in case!
if (st->Append () == 0) {
- st->ErrorMsg ("Trying to append new node");
+ st->ErrorMsg ("Trying to append new node");
}
-
+
if (wxDebugContext::GetCheckPrevious ()) {
- if (st->CheckAllPrevious () < 0) {
- st->ErrorMsg ("Checking previous nodes");
- }
+ if (st->CheckAllPrevious () < 0) {
+ st->ErrorMsg ("Checking previous nodes");
+ }
}
-
+
// Set up the extra markers at the middle and end.
char * ptr = wxDebugContext::MidMarkerPos (buf);
* (wxMarkerType *) ptr = MemMidCheck;
{
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())
wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
if (! st->ValidateNode ())
- return;
+ return;
// If this is the current checkpoint, we need to
// move the checkpoint back so it points to a valid
{
st->ErrorMsg ("Unlinking deleted node");
}
-
+
// Now put in the fill char into the id slot and the caller requested
// memory locations.
st->SetDeleted ();
(void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
- st->RequestSize ());
+ st->RequestSize ());
// Don't allow delayed freeing of memory in this version
// if (!wxDebugContext::GetDelayFree())
}
// Trace: send output to the current debugging stream
-void wxTrace(const char *fmt ...)
+void wxTrace(const wxChar *fmt ...)
{
- 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 level, const wxChar *fmt ...)
{
+#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
}
-#else // wxUSE_MEMORY_TRACING && WXDEBUG
+#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
void wxTrace(const char *WXUNUSED(fmt) ...)
{
}
projects / wxWidgets.git / blobdiff