X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc1efb1d9f4e4ce7d8f889dad3aaab7026b73058..757cc9def70e4685054f4a24238e2df111f6c9fd:/src/common/memory.cpp?ds=sidebyside diff --git a/src/common/memory.cpp b/src/common/memory.cpp index a67263d476..5302fe214d 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -40,11 +40,14 @@ #include "wx/ioswrap.h" +// Obsolete +#if 0 #if wxUSE_IOSTREAMH #include #else #include #endif +#endif #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\ && !defined( __MWERKS__ ) && !defined(__SALFORDC__) @@ -111,7 +114,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; @@ -122,7 +125,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; @@ -344,7 +347,7 @@ void wxMemStruct::PrintNode () msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg += msg2; - wxLogDebug(msg); + wxLogMessage(msg); } else { @@ -357,7 +360,7 @@ void wxMemStruct::PrintNode () msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize()); msg += msg2; - wxLogDebug(msg); + wxLogMessage(msg); } } @@ -390,7 +393,7 @@ void wxMemStruct::Dump () msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg += msg2; - wxLogDebug(msg); + wxLogMessage(msg); } else { @@ -401,7 +404,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); } } @@ -419,7 +422,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; @@ -461,12 +464,15 @@ int wxMemStruct::ValidateNode () wxMemStruct *wxDebugContext::m_head = NULL; wxMemStruct *wxDebugContext::m_tail = NULL; -// ostream *wxDebugContext::m_debugStream = NULL; -// streambuf *wxDebugContext::m_streamBuf = 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 -streambuf *wxDebugContext::m_streamBuf = NULL; -ostream *wxDebugContext::m_debugStream = NULL; +// Obsolete +#if 0 +wxSTD streambuf *wxDebugContext::m_streamBuf = NULL; +wxSTD ostream *wxDebugContext::m_debugStream = NULL; +#endif bool wxDebugContext::m_checkPrevious = FALSE; int wxDebugContext::debugLevel = 1; @@ -481,12 +487,12 @@ int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&marker wxDebugContext::wxDebugContext(void) { // m_streamBuf = new wxDebugStreamBuf; -// m_debugStream = new ostream(m_streamBuf); +// m_debugStream = new wxSTD ostream(m_streamBuf); } wxDebugContext::~wxDebugContext(void) { - SetStream(NULL, NULL); +// SetStream(NULL, NULL); } /* @@ -494,7 +500,9 @@ wxDebugContext::~wxDebugContext(void) * between SetFile and SetStream. */ -void wxDebugContext::SetStream(ostream *str, streambuf *buf) +// Obsolete +#if 0 +void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf) { if (m_debugStream) { @@ -508,7 +516,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf) #ifndef __WATCOMC__ if (m_streamBuf) { - streambuf* oldBuf = m_streamBuf; + wxSTD streambuf* oldBuf = m_streamBuf; m_streamBuf = NULL; delete oldBuf; } @@ -519,7 +527,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf) bool wxDebugContext::SetFile(const wxString& file) { - ofstream *str = new ofstream(file.fn_str()); + wxSTD ofstream *str = new wxSTD ofstream(file.mb_str()); if (str->bad()) { @@ -539,7 +547,7 @@ bool wxDebugContext::SetStandardError(void) #if 0 #if !defined(_WINDLL) wxDebugStreamBuf *buf = new wxDebugStreamBuf; - ostream *stream = new ostream(m_streamBuf); + wxSTD ostream *stream = new wxSTD ostream(m_streamBuf); SetStream(stream, buf); return TRUE; #else @@ -548,7 +556,8 @@ bool wxDebugContext::SetStandardError(void) #endif return FALSE; } - +#endif + // 0 /* Work out the positions of the markers by creating an array of 2 markers @@ -615,13 +624,13 @@ size_t wxDebugContext::PaddedSize (const size_t size) { // Added by Terry Farnham to replace // slow GetPadding call. - int padb; + int padb; - padb = size & m_balignmask; - if(padb) - return(size + m_balign - padb); - else - return(size); + padb = size & m_balignmask; + if(padb) + return(size + m_balign - padb); + else + return(size); // Old (slow) code #if 0 @@ -649,7 +658,8 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from) 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)) @@ -686,23 +696,23 @@ bool wxDebugContext::Dump(void) // if (TRUE) { - wxChar* appName = wxT("application"); + wxChar* appName = (wxChar*) wxT("application"); wxString appNameStr(""); if (wxTheApp) { 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 @@ -710,6 +720,7 @@ bool wxDebugContext::Dump(void) #endif } +#ifdef __WXDEBUG__ struct wxDebugStatsStruct { long instanceCount; @@ -734,6 +745,7 @@ static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugSt st->next = head; return st; } +#endif bool wxDebugContext::PrintStatistics(bool detailed) { @@ -743,17 +755,17 @@ bool wxDebugContext::PrintStatistics(bool detailed) // if (TRUE) { - wxChar* appName = wxT("application"); + wxChar* appName = (wxChar*) wxT("application"); wxString appNameStr(wxT("")); if (wxTheApp) { 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 -----") ); } } @@ -777,12 +789,12 @@ bool wxDebugContext::PrintStatistics(bool detailed) // if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf)) 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(); if (obj->GetClassInfo()->GetClassName()) - className = obj->GetClassInfo()->GetClassName(); + className = (wxChar*)obj->GetClassInfo()->GetClassName(); } wxDebugStatsStruct *stats = FindStatsStruct(list, className); if (!stats) @@ -812,25 +824,26 @@ 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 + (void)detailed; return FALSE; #endif } @@ -842,13 +855,13 @@ bool wxDebugContext::PrintClasses(void) // if (TRUE) { - wxChar* appName = wxT("application"); + wxChar* appName = (wxChar*) wxT("application"); wxString appNameStr(wxT("")); if (wxTheApp) { appNameStr = wxTheApp->GetAppName(); appName = WXSTRINGCAST appNameStr; - wxLogDebug(wxT("----- Classes in %s -----"), appName); + wxLogMessage(wxT("----- Classes in %s -----"), appName); } } @@ -881,15 +894,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; } @@ -944,114 +957,16 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint) 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 defined(__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 __VISUALC__ -#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, wxChar * fileName, int lineNum) -{ -#ifdef NO_DEBUG_ALLOCATION - return malloc(size); -#else - return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE); -#endif -} - -// Added JACS 25/11/98 -void * operator new (size_t size) -{ -#ifdef NO_DEBUG_ALLOCATION - return malloc(size); -#else - return wxDebugAlloc(size, NULL, 0, FALSE); -#endif -} - -#if wxUSE_ARRAY_MEMORY_OPERATORS -void * operator new[] (size_t size) -{ -#ifdef NO_DEBUG_ALLOCATION - return malloc(size); -#else - return wxDebugAlloc(size, NULL, 0, FALSE, TRUE); -#endif -} -#endif - -#if wxUSE_ARRAY_MEMORY_OPERATORS -void * operator new[] (size_t size, wxChar * fileName, int lineNum) -{ -#ifdef NO_DEBUG_ALLOCATION - return malloc(size); -#else - return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE); -#endif -} -#endif - -#if !defined(__VISAGECPP__) // already defines this by default -void operator delete (void * buf) -{ -#ifdef NO_DEBUG_ALLOCATION - free((char*) buf); -#else - wxDebugFree(buf); -#endif -} -#endif - -// VC++ 6.0 -#if defined(__VISUALC__) && (__VISUALC__ >= 1200) -void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */) -{ - wxDebugFree(pData, FALSE); -} -// New operator 21/11/1998 -void operator delete[](void* pData, char* /* fileName */, int /* lineNum */) -{ - wxDebugFree(pData, TRUE); -} -#endif - -#if wxUSE_ARRAY_MEMORY_OPERATORS - -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, 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); @@ -1060,7 +975,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; @@ -1104,6 +1019,10 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) ) 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()) @@ -1144,9 +1063,12 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) ) } // Trace: send output to the current debugging stream -void wxTrace(const wxChar *fmt ...) +void wxTrace(const wxChar * ...) { - va_list ap; +#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); @@ -1174,11 +1096,15 @@ void wxTrace(const wxChar *fmt ...) #else fprintf(stderr, buffer); #endif +#endif } // Trace with level -void wxTraceLevel(int level, const wxChar *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; @@ -1188,7 +1114,7 @@ void wxTraceLevel(int level, const wxChar *fmt ...) va_start(ap, fmt); #ifdef __WXMSW__ - wvsprintf(buffer,fmt,ap) ; + wxWvsprintf(buffer,fmt,ap) ; #else vsprintf(buffer,fmt,ap) ; #endif @@ -1210,6 +1136,7 @@ void wxTraceLevel(int level, const wxChar *fmt ...) #else fprintf(stderr, buffer); #endif +#endif } #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)