Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied memory allocation patch, and worked around bug that crashes memcheck.cpp

Browse Source 
by using wxLogStderr.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-09-07 15:02:33 +00:00
parent 26a80c2246
commit 2db0bbdecd
5 changed files with 83 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
include/wx/memory.h
View File

@@ -40,10 +40,22 @@
#ifdef __WXDEBUG__
void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);
void wxDebugFree(void * buf, bool isVect = FALSE);
// devik 2000-8-27: export these because new/delete operators are now inline
WXDLLEXPORT void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);
WXDLLEXPORT void wxDebugFree(void * buf, bool isVect = FALSE);
//**********************************************************************************
/*
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.
// devik 2000-8-29: All new/delete ops are now inline because they can't
// be marked as dllexport/dllimport. It then leads to weird bugs when
// used on MSW as DLL
// Global versions of the new and delete operators.
#if wxUSE_GLOBAL_MEMORY_OPERATORS
// Undefine temporarily (new is #defined in object.h) because we want to
@@ -61,35 +73,60 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
#ifndef __EDG_ABI_COMPATIBILITY_VERSION
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#endif
#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
#define wxUSE_ARRAY_MEMORY_OPERATORS 1
#else
// ::operator new[] is a recent C++ feature, so assume it's not supported
#define wxUSE_ARRAY_MEMORY_OPERATORS 0
#endif
// Added JACS 25/11/98: needed for some compilers
void * operator new (size_t size);
WXDLLEXPORT void * operator new (size_t size, wxChar * fileName, int lineNum);
inline void * operator new (size_t size, wxChar * fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, FALSE, FALSE);
}
#if !defined(__VISAGECPP__)
void operator delete (void * buf);
#endif
inline void * operator new (size_t size)
{
return wxDebugAlloc(size, NULL, 0, FALSE);
}
inline void operator delete (void * buf)
{
wxDebugFree(buf, FALSE);
}
#if wxUSE_ARRAY_MEMORY_OPERATORS
WXDLLEXPORT void* operator new[] (size_t size);
WXDLLEXPORT void* operator new[] (size_t size, wxChar * fileName, int lineNum);
WXDLLEXPORT void operator delete[] (void * buf);
inline void * operator new[] (size_t size)
{
return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
}
inline void * operator new[] (size_t size, wxChar * fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, FALSE, TRUE);
}
inline void operator delete[] (void * buf)
{
wxDebugFree(buf, TRUE);
}
#endif
// VC++ 6.0
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
WXDLLEXPORT void operator delete(void *buf, wxChar*, int);
WXDLLEXPORT void operator delete[](void *buf, wxChar*, int);
#endif
inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
{
wxDebugFree(pData, FALSE);
}
inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNum */)
{
wxDebugFree(pData, TRUE);
}
#endif // __VISUALC__>=1200
#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
#endif // __WXDEBUG__
#endif
// wxUSE_GLOBAL_MEMORY_OPERATORS
#endif
// __WXDEBUG__
//**********************************************************************************
typedef unsigned int wxMarkerType;

7
samples/memcheck/memcheck.cpp
View File

@@ -93,10 +93,17 @@ bool MyApp::OnInit(void)
const char *data = (const char*) thing ;
// On MSW, Dump() crashes if using wxLogGui,
// so use wxLogStderr instead.
wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
wxDebugContext::PrintClasses();
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
// Set back to wxLogGui
delete wxLog::SetActiveTarget(oldLog);
// Don't delete these objects, to force wxApp to flag a memory leak.
// delete thing;
// delete date;

105
src/common/memory.cpp
View File

@@ -649,7 +649,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))
@@ -944,108 +945,6 @@ 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, wxChar* /* 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) )
{

9
src/gtk/app.cpp
View File

@@ -653,6 +653,15 @@ void wxEntryCleanup()
int wxEntry( int argc, char *argv[] )
{
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
// This seems to be necessary since there are 'rogue'
// objects present at this point (perhaps global objects?)
// Setting a checkpoint will ignore them as far as the
// memory checking facility is concerned.
// Of course you may argue that memory allocated in globals should be
// checked, but this is a reasonable compromise.
wxDebugContext::SetCheckpoint();
#endif
int err = wxEntryStart(argc, argv);
if (err)
return err;

9
src/gtk1/app.cpp
View File

@@ -653,6 +653,15 @@ void wxEntryCleanup()
int wxEntry( int argc, char *argv[] )
{
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
// This seems to be necessary since there are 'rogue'
// objects present at this point (perhaps global objects?)
// Setting a checkpoint will ignore them as far as the
// memory checking facility is concerned.
// Of course you may argue that memory allocated in globals should be
// checked, but this is a reasonable compromise.
wxDebugContext::SetCheckpoint();
#endif
int err = wxEntryStart(argc, argv);
if (err)
return err;