#include "wx/app.h"
#endif
-#include <wx/log.h>
+#include "wx/log.h"
#include <stdlib.h>
#include "wx/ioswrap.h"
+// Obsolete
+#if 0
#if wxUSE_IOSTREAMH
#include <fstream.h>
#else
#include <fstream>
#endif
+#endif
-#if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
+ && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <memory.h>
#endif
*/
void wxMemStruct::ErrorMsg (const char * mesg)
{
- wxLogDebug(_T("wxWindows memory checking error: %s"), mesg);
+ wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
PrintNode ();
// << m_fileName << ' ' << m_lineNum << endl;
*/
void wxMemStruct::ErrorMsg ()
{
- wxLogDebug(_T("wxWindows over/underwrite memory error:"));
+ wxLogMessage(wxT("wxWindows 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(_T(""));
+ wxString msg(wxT(""));
if (m_fileName)
- msg.Printf(_T("%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 += _T("object");
+ msg += wxT("object");
wxString msg2;
- msg2.Printf(_T(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
else
{
wxString msg("");
if (m_fileName)
- msg.Printf(_T("%s(%d): "), m_fileName, (int)m_lineNum);
- msg += _T("non-object data");
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+ msg += wxT("non-object data");
wxString msg2;
- msg2.Printf(_T(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
}
{
wxObject *obj = (wxObject *)m_actualData;
- wxString msg(_T(""));
+ wxString msg(wxT(""));
if (m_fileName)
- msg.Printf(_T("%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 += _T("unknown object class");
+ msg += wxT("unknown object class");
wxString msg2("");
- msg2.Printf(_T(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
else
{
- wxString msg(_T(""));
+ wxString msg(wxT(""));
if (m_fileName)
- msg.Printf(_T("%s(%d): "), m_fileName, (int)m_lineNum);
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
wxString msg2("");
- msg2.Printf(_T("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
+ msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
msg += msg2;
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
}
else {
// Can't use the error routines as we have no recognisable object.
#ifndef __WXGTK__
- wxLogDebug(_T("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;
+// 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;
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;
-// m_debugStream = new ostream(m_streamBuf);
+// m_debugStream = new wxSTD ostream(m_streamBuf);
}
wxDebugContext::~wxDebugContext(void)
{
- SetStream(NULL, NULL);
+// SetStream(NULL, NULL);
}
/*
* 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)
{
#ifndef __WATCOMC__
if (m_streamBuf)
{
- streambuf* oldBuf = m_streamBuf;
+ wxSTD streambuf* oldBuf = m_streamBuf;
m_streamBuf = NULL;
delete oldBuf;
}
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())
{
#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
#endif
return FALSE;
}
-
+#endif
+ // 0
/*
Work out the positions of the markers by creating an array of 2 markers
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
}
/*
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 (TRUE)
{
- wxChar* appName = _T("application");
+ wxChar* appName = wxT("application");
wxString appNameStr("");
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogDebug(_T("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+ wxLogMessage(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogDebug( _T("----- Memory dump -----") );
+ wxLogMessage( wxT("----- Memory dump -----") );
}
}
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- wxLogDebug( _T("") );
- wxLogDebug( _T("") );
+ wxLogMessage( wxT("") );
+ wxLogMessage( wxT("") );
return TRUE;
#else
#endif
}
+#ifdef __WXDEBUG__
struct wxDebugStatsStruct
{
long instanceCount;
st->next = head;
return st;
}
+#endif
bool wxDebugContext::PrintStatistics(bool detailed)
{
// if (TRUE)
{
- wxChar* appName = _T("application");
- wxString appNameStr(_T(""));
+ wxChar* appName = wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogDebug(_T("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+ wxLogMessage(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogDebug( _T("----- Memory statistics -----") );
+ wxLogMessage( wxT("----- Memory statistics -----") );
}
}
// if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
if (detailed && (data != (void*) wxLog::GetActiveTarget()))
{
- wxChar *className = _T("nonobject");
+ wxChar *className = 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)
{
while (list)
{
- wxLogDebug(_T("%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(_T(""));
+ wxLogMessage(wxT(""));
}
SetDebugMode(currentMode);
- wxLogDebug(_T("Number of object items: %ld"), noObjectNodes);
- wxLogDebug(_T("Number of non-object items: %ld"), noNonObjectNodes);
- wxLogDebug(_T("Total allocated size: %ld"), totalSize);
- wxLogDebug(_T(""));
- wxLogDebug(_T(""));
+ 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
}
// if (TRUE)
{
- wxChar* appName = _T("application");
- wxString appNameStr(_T(""));
+ wxChar* appName = wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
appName = WXSTRINGCAST appNameStr;
- wxLogDebug(_T("----- Classes in %s -----"), appName);
+ wxLogMessage(wxT("----- Classes in %s -----"), appName);
}
}
if (info->GetClassName())
{
wxString msg(info->GetClassName());
- msg += _T(" ");
+ msg += wxT(" ");
if (info->GetBaseClassName1() && !info->GetBaseClassName2())
{
- msg += _T("is a ");
+ msg += wxT("is a ");
msg += info->GetBaseClassName1();
}
else if (info->GetBaseClassName1() && info->GetBaseClassName2())
{
- msg += _T("is a ");
+ msg += wxT("is a ");
msg += info->GetBaseClassName1() ;
- msg += _T(", ");
+ msg += wxT(", ");
msg += info->GetBaseClassName2() ;
}
if (info->GetConstructor())
- msg += _T(": dynamic");
+ msg += wxT(": dynamic");
- wxLogDebug(msg);
+ wxLogMessage(msg);
}
node = wxClassInfo::sm_classTable->Next();
n ++;
}
- wxLogDebug(_T(""));
- wxLogDebug(_T("There are %d classes derived from wxObject."), n);
- wxLogDebug(_T(""));
- wxLogDebug(_T(""));
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
+ wxLogMessage(wxT(""));
+ wxLogMessage(wxT(""));
return TRUE;
}
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
-
-void operator delete (void * buf)
-{
-#ifdef NO_DEBUG_ALLOCATION
- free((char*) buf);
-#else
- wxDebugFree(buf);
-#endif
-}
-
-// VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
-{
-// ::operator delete(pData);
- // JACS 21/11/1998: surely we need to call wxDebugFree?
- 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);
int totSize = wxDebugContext::TotSize (size);
char * buf = (char *) malloc(totSize);
if (!buf) {
- wxLogDebug(_T("Call to malloc (%ld) failed."), (long)size);
+ wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);
return 0;
}
wxMemStruct * st = (wxMemStruct *)buf;
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())
}
// 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);
}
else
#ifdef __WXMSW__
+#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 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;
va_start(ap, fmt);
#ifdef __WXMSW__
- wvsprintf(buffer,fmt,ap) ;
+ wxWvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
#endif
}
else
#ifdef __WXMSW__
+#ifdef __WIN32__
OutputDebugString((LPCTSTR)buffer) ;
+#else
+ OutputDebugString((const char*) buffer) ;
+#endif
#else
fprintf(stderr, buffer);
#endif
+#endif
}
#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
projects / wxWidgets.git / blobdiff