Menu
▾
▴
[libcw-cvs] [CVS] Module src
|
From: Carlo W. <li...@us...> - 2002-02-20 03:56:04
|
CVSROOT : /cvsroot/libcw
Module : src
Commit time: 2002-01-20 03:56:02 UTC
Modified files:
libcwd/NEWS libcwd/bfd.cc libcwd/debugmalloc.cc
libcwd/include/libcw/bfd.h libcwd/include/libcw/debug.h
libcwd/include/libcw/debug_config.ho.in
libcwd/include/libcw/debugmalloc.h
libcwd/include/libcw/macro_AllocTag.h
libcwd/include/libcw/macro_Libcwd_macros.h
libcwd/include/libcw/private_allocator.h
Log message:
Renamed macros to LIBCWD_*.
---------------------- diff included ----------------------
Index: src/libcwd/NEWS
diff -u src/libcwd/NEWS:1.73 src/libcwd/NEWS:1.74
--- src/libcwd/NEWS:1.73 Sun Feb 17 22:08:05 2002
+++ src/libcwd/NEWS Tue Feb 19 19:55:51 2002
@@ -1,3 +1,5 @@
+libcwd-0.99.18
+
libcwd-0.99.17
A tutorial on debugging threaded applications was added.
Index: src/libcwd/bfd.cc
diff -u src/libcwd/bfd.cc:1.104 src/libcwd/bfd.cc:1.105
--- src/libcwd/bfd.cc:1.104 Sun Feb 17 17:24:46 2002
+++ src/libcwd/bfd.cc Tue Feb 19 19:55:51 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/bfd.cc,v 1.104 2002/02/18 01:24:46 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/bfd.cc,v 1.105 2002/02/20 03:55:51 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -49,7 +49,7 @@
#endif
#include "cwd_debug.h"
#include "ios_base_Init.h"
-#ifdef CWDEBUG_DLOPEN_DEFINED
+#ifdef LIBCWD_DLOPEN_DEFINED
#undef dlopen
#undef dlclose
#endif
@@ -1429,7 +1429,7 @@
} // namespace debug
} // namespace libcw
-#ifdef CWDEBUG_DLOPEN_DEFINED
+#ifdef LIBCWD_DLOPEN_DEFINED
using namespace libcw::debug;
struct dlloaded_st {
@@ -1527,6 +1527,6 @@
}
} // extern "C"
-#endif // CWDEBUG_DLOPEN_DEFINED
+#endif // LIBCWD_DLOPEN_DEFINED
#endif // !DEBUGUSEBFD
Index: src/libcwd/debugmalloc.cc
diff -u src/libcwd/debugmalloc.cc:1.84 src/libcwd/debugmalloc.cc:1.85
--- src/libcwd/debugmalloc.cc:1.84 Sun Feb 17 17:24:46 2002
+++ src/libcwd/debugmalloc.cc Tue Feb 19 19:55:51 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/debugmalloc.cc,v 1.84 2002/02/18 01:24:46 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/debugmalloc.cc,v 1.85 2002/02/20 03:55:51 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -186,7 +186,7 @@
#define ACQUIRE_WRITE2READ_LOCK
#endif // !LIBCWD_THREAD_SAFE
-#ifdef DEBUGMALLOCEXTERNALCLINKAGE
+#ifdef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
#define __libcwd_malloc malloc
#define __libcwd_calloc calloc
#define __libcwd_realloc realloc
@@ -398,7 +398,7 @@
// _private_::
void set_alloc_checking_off(LIBCWD_TSD_PARAM)
{
- DEBUGDEBUGMALLOC_CERR( "set_alloc_checking_off called from " << __builtin_return_address(0) << ": internal == " << __libcwd_tsd.internal << "; setting it to " << __libcwd_tsd.internal + 1 << '.' );
+ LIBCWD_DEBUGM_CERR( "set_alloc_checking_off called from " << __builtin_return_address(0) << ": internal == " << __libcwd_tsd.internal << "; setting it to " << __libcwd_tsd.internal + 1 << '.' );
++__libcwd_tsd.internal;
}
@@ -407,7 +407,7 @@
{
if (__libcwd_tsd.internal == 0)
DoutFatal( dc::core, "Calling `set_alloc_checking_on' while ALREADY on." );
- DEBUGDEBUGMALLOC_CERR( "set_alloc_checking_on from " << __builtin_return_address(0) << ": internal == " << __libcwd_tsd.internal << "; setting it to " << __libcwd_tsd.internal - 1 << '.' );
+ LIBCWD_DEBUGM_CERR( "set_alloc_checking_on from " << __builtin_return_address(0) << ": internal == " << __libcwd_tsd.internal << "; setting it to " << __libcwd_tsd.internal - 1 << '.' );
--__libcwd_tsd.internal;
}
#endif
@@ -998,7 +998,7 @@
dm_alloc_ct* ap = a_alloc_node.get();
#ifdef DEBUGDEBUGMALLOC
if (ap)
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: memblk_info_ct::erase for " << ap->start() );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: memblk_info_ct::erase for " << ap->start() );
#endif
if (ap && ap->next_list())
{
@@ -1262,11 +1262,11 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#endif
-#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(DEBUGMALLOCEXTERNALCLINKAGE)
+#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC)
LIBCWD_ASSERT( _private_::WST_ios_base_initialized || __libcwd_tsd.internal );
#endif
if (__libcwd_tsd.internal)
@@ -1274,15 +1274,15 @@
#if defined(DEBUGDEBUGMALLOC) && defined(DEBUGDEBUGOUTPUT)
if (from == from_delete)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal `delete(" << ptr << ")' [" << ++__libcwd_tsd.marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal `delete(" << ptr << ")' [" << ++__libcwd_tsd.marker << ']' );
}
else if (from == from_delete_array)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal `delete[](" << ptr << ")' [" << ++__libcwd_tsd.marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal `delete[](" << ptr << ")' [" << ++__libcwd_tsd.marker << ']' );
}
else
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal `free(" << ptr << ")' [" << ++__libcwd_tsd.marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal `free(" << ptr << ")' [" << ++__libcwd_tsd.marker << ']' );
}
#endif // DEBUGDEBUGMALLOC
#ifdef DEBUGMAGICMALLOC
@@ -2027,7 +2027,7 @@
#endif // DEBUGDEBUGMALLOC
-#ifndef DEBUGMALLOCEXTERNALCLINKAGE
+#ifndef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
// If we cannot call the libc malloc functions directly, then we cannot declare
// a malloc function with external linkage but instead have to use a macro `malloc'
@@ -2099,7 +2099,7 @@
#endif
--__libcwd_tsd.inside_malloc_or_free;
}
-#endif // !DEBUGMALLOCEXTERNALCLINKAGE
+#endif // !LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
} // namespace debug
} // namespace libcw
@@ -2146,12 +2146,12 @@
int saved_marker = ++__libcwd_tsd.marker;
#endif
#endif
-#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(DEBUGMALLOCEXTERNALCLINKAGE)
+#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC)
LIBCWD_ASSERT( _private_::WST_ios_base_initialized || __libcwd_tsd.internal );
#endif
if (__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `__libcwd_malloc(" << size << ")' [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `__libcwd_malloc(" << size << ")' [" << saved_marker << ']' );
#if !defined(DEBUGDEBUGMALLOC) && !defined(DEBUGMAGICMALLOC)
return __libc_malloc(size);
@@ -2159,7 +2159,7 @@
#ifndef DEBUGMAGICMALLOC
void* ptr = __libc_malloc(size);
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_malloc': " << ptr << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_malloc': " << ptr << " [" << saved_marker << ']' );
return ptr;
#else // DEBUGMAGICMALLOC
void* ptr = __libc_malloc(SIZE_PLUS_TWELVE(size));
@@ -2168,7 +2168,7 @@
((size_t*)ptr)[0] = INTERNAL_MAGIC_MALLOC_BEGIN;
((size_t*)ptr)[1] = size;
((size_t*)(static_cast<char*>(ptr) + SIZE_PLUS_TWELVE(size)))[-1] = INTERNAL_MAGIC_MALLOC_END;
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_malloc': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_malloc': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
return static_cast<size_t*>(ptr) + 2;
#endif // DEBUGMAGICMALLOC
@@ -2201,19 +2201,19 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#ifdef DEBUGDEBUGOUTPUT
int saved_marker = ++__libcwd_tsd.marker;
#endif
#endif
-#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(DEBUGMALLOCEXTERNALCLINKAGE)
+#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC)
LIBCWD_ASSERT( _private_::WST_ios_base_initialized || __libcwd_tsd.internal );
#endif
if (__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `__libcwd_calloc(" << nmemb << ", " << size << ")' [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `__libcwd_calloc(" << nmemb << ", " << size << ")' [" << saved_marker << ']' );
#if !defined(DEBUGDEBUGMALLOC) && !defined(DEBUGMAGICMALLOC)
return __libc_calloc(nmemb, size);
@@ -2221,7 +2221,7 @@
#ifndef DEBUGMAGICMALLOC
void* ptr = __libc_calloc(nmemb, size);
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_calloc': " << ptr << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_calloc': " << ptr << " [" << saved_marker << ']' );
return ptr;
#else // DEBUGMAGICMALLOC
void* ptr = __libc_malloc(SIZE_PLUS_TWELVE(nmemb * size));
@@ -2231,7 +2231,7 @@
((size_t*)ptr)[0] = INTERNAL_MAGIC_MALLOC_BEGIN;
((size_t*)ptr)[1] = nmemb * size;
((size_t*)(static_cast<char*>(ptr) + SIZE_PLUS_TWELVE(nmemb * size)))[-1] = INTERNAL_MAGIC_MALLOC_END;
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_calloc': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_calloc': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
return static_cast<size_t*>(ptr) + 2;
#endif // DEBUGMAGICMALLOC
@@ -2274,19 +2274,19 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#ifdef DEBUGDEBUGOUTPUT
int saved_marker = ++__libcwd_tsd.marker;
#endif
#endif
-#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(DEBUGMALLOCEXTERNALCLINKAGE)
+#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC)
LIBCWD_ASSERT( _private_::WST_ios_base_initialized || __libcwd_tsd.internal );
#endif
if (__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `__libcwd_realloc(" << ptr << ", " << size << ")' [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `__libcwd_realloc(" << ptr << ", " << size << ")' [" << saved_marker << ']' );
#if !defined(DEBUGDEBUGMALLOC) && !defined(DEBUGMAGICMALLOC)
return __libc_realloc(ptr, size);
@@ -2294,7 +2294,7 @@
#ifndef DEBUGMAGICMALLOC
void* ptr1 = __libc_realloc(ptr, size);
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_realloc': " << ptr1 << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_realloc': " << ptr1 << " [" << saved_marker << ']' );
return ptr1;
#else // DEBUGMAGICMALLOC
void* ptr1;
@@ -2307,7 +2307,7 @@
if (size == 0)
{
__libc_free(ptr);
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_realloc': NULL [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_realloc': NULL [" << saved_marker << ']' );
return NULL;
}
ptr1 = __libc_realloc(ptr, SIZE_PLUS_TWELVE(size));
@@ -2317,7 +2317,7 @@
((size_t*)ptr1)[0] = INTERNAL_MAGIC_MALLOC_BEGIN;
((size_t*)ptr1)[1] = size;
((size_t*)(static_cast<char*>(ptr1) + SIZE_PLUS_TWELVE(size)))[-1] = INTERNAL_MAGIC_MALLOC_END;
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_realloc': " << static_cast<size_t*>(ptr1) + 2 << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `__libcwd_realloc': " << static_cast<size_t*>(ptr1) + 2 << " [" << saved_marker << ']' );
return static_cast<size_t*>(ptr1) + 2;
#endif // DEBUGMAGICMALLOC
@@ -2486,7 +2486,7 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#ifdef DEBUGDEBUGOUTPUT
@@ -2495,7 +2495,7 @@
#endif
if (__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `operator new', size = " << size << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `operator new', size = " << size << " [" << saved_marker << ']' );
#if !defined(DEBUGDEBUGMALLOC) && !defined(DEBUGMAGICMALLOC)
return __libc_malloc(size);
@@ -2505,7 +2505,7 @@
void* ptr = __libc_malloc(size);
if (!ptr)
DoutFatalInternal( dc::core, "Out of memory in `operator new'" );
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new': " << ptr << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new': " << ptr << " [" << saved_marker << ']' );
return ptr;
#else // DEBUGMAGICMALLOC
void* ptr = __libc_malloc(SIZE_PLUS_TWELVE(size));
@@ -2514,7 +2514,7 @@
((size_t*)ptr)[0] = INTERNAL_MAGIC_NEW_BEGIN;
((size_t*)ptr)[1] = size;
((size_t*)(static_cast<char*>(ptr) + SIZE_PLUS_TWELVE(size)))[-1] = INTERNAL_MAGIC_NEW_END;
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
return static_cast<size_t*>(ptr) + 2;
#endif // DEBUGMAGICMALLOC
@@ -2549,7 +2549,7 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#ifdef DEBUGDEBUGOUTPUT
@@ -2558,7 +2558,7 @@
#endif
if (__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `operator new[]', size = " << size << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Entering `operator new[]', size = " << size << " [" << saved_marker << ']' );
#if !defined(DEBUGDEBUGMALLOC) && !defined(DEBUGMAGICMALLOC)
return __libc_malloc(size);
@@ -2568,7 +2568,7 @@
void* ptr = __libc_malloc(size);
if (!ptr)
DoutFatalInternal( dc::core, "Out of memory in `operator new[]'" );
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new[]': " << ptr << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new[]': " << ptr << " [" << saved_marker << ']' );
return ptr;
#else // DEBUGMAGICMALLOC
void* ptr = __libc_malloc(SIZE_PLUS_TWELVE(size));
@@ -2577,7 +2577,7 @@
((size_t*)ptr)[0] = INTERNAL_MAGIC_NEW_ARRAY_BEGIN;
((size_t*)ptr)[1] = size;
((size_t*)(static_cast<char*>(ptr) + SIZE_PLUS_TWELVE(size)))[-1] = INTERNAL_MAGIC_NEW_ARRAY_END;
- DEBUGDEBUGMALLOC_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new[]': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
+ LIBCWD_DEBUGM_CERR( "DEBUGDEBUGMALLOC: Internal: Leaving `operator new[]': " << static_cast<size_t*>(ptr) + 2 << " [" << saved_marker << ']' );
return static_cast<size_t*>(ptr) + 2;
#endif // DEBUGMAGICMALLOC
@@ -2617,11 +2617,11 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#endif
-#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(DEBUGMALLOCEXTERNALCLINKAGE)
+#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC)
LIBCWD_ASSERT( _private_::WST_ios_base_initialized || __libcwd_tsd.internal );
#endif
internal_free(ptr, from_delete LIBCWD_COMMA_TSD);
@@ -2634,11 +2634,11 @@
// We can't use `assert' here, because that can call malloc.
if (__libcwd_tsd.inside_malloc_or_free > __libcwd_tsd.library_call && !__libcwd_tsd.internal)
{
- DEBUGDEBUGMALLOC_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
+ LIBCWD_DEBUGM_CERR("DEBUGDEBUGMALLOC: debugmalloc.cc:" << __LINE__ - 2 << ": " << __PRETTY_FUNCTION__ << ": Assertion `__libcwd_tsd.inside_malloc_or_free <= __libcwd_tsd.library_call || __libcwd_tsd.internal' failed.");
core_dump();
}
#endif
-#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(DEBUGMALLOCEXTERNALCLINKAGE)
+#if defined(DEBUGDEBUGMALLOC) && defined(__GLIBCPP__) && !defined(LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC)
LIBCWD_ASSERT( _private_::WST_ios_base_initialized || __libcwd_tsd.internal );
#endif
internal_free(ptr, from_delete_array LIBCWD_COMMA_TSD); // Note that the standard demands that we call free(), and not delete().
Index: src/libcwd/include/libcw/bfd.h
diff -u src/libcwd/include/libcw/bfd.h:1.23 src/libcwd/include/libcw/bfd.h:1.24
--- src/libcwd/include/libcw/bfd.h:1.23 Sun Feb 17 17:24:47 2002
+++ src/libcwd/include/libcw/bfd.h Tue Feb 19 19:55:52 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/bfd.h,v 1.23 2002/02/18 01:24:47 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/bfd.h,v 1.24 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -28,13 +28,13 @@
#include <libcw/pc_mangled_function_name.h>
#endif
-#ifdef CWDEBUG_DLOPEN_DEFINED
+#ifdef LIBCWD_DLOPEN_DEFINED
#include <dlfcn.h>
#define dlopen __libcwd_dlopen
#define dlclose __libcwd_dlclose
extern "C" void* dlopen(char const*, int);
extern "C" int dlclose(void*);
-#endif // CWDEBUG_DLOPEN_DEFINED
+#endif // LIBCWD_DLOPEN_DEFINED
// Include the inline functions.
#ifndef LIBCW_CLASS_LOCATION_INL
Index: src/libcwd/include/libcw/debug.h
diff -u src/libcwd/include/libcw/debug.h:1.43 src/libcwd/include/libcw/debug.h:1.44
--- src/libcwd/include/libcw/debug.h:1.43 Sun Feb 17 17:24:47 2002
+++ src/libcwd/include/libcw/debug.h Tue Feb 19 19:55:52 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debug.h,v 1.43 2002/02/18 01:24:47 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debug.h,v 1.44 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -80,7 +80,7 @@
extern channel_ct system;
extern channel_ct warning;
#ifdef DEBUGMALLOC
-#ifdef DEBUGMALLOCEXTERNALCLINKAGE
+#ifdef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
extern channel_ct malloc;
#else
extern channel_ct __libcwd_malloc;
Index: src/libcwd/include/libcw/debug_config.ho.in
diff -u src/libcwd/include/libcw/debug_config.ho.in:1.20 src/libcwd/include/libcw/debug_config.ho.in:1.21
--- src/libcwd/include/libcw/debug_config.ho.in:1.20 Sun Feb 17 17:24:47 2002
+++ src/libcwd/include/libcw/debug_config.ho.in Tue Feb 19 19:55:52 2002
@@ -1,5 +1,5 @@
// @configure_input@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debug_config.ho.in,v 1.20 2002/02/18 01:24:47 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debug_config.ho.in,v 1.21 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -270,12 +270,12 @@
#@CW_CONFIG_HAVE___LIBC_MALLOC@ LIBCWD_HAVE___LIBC_MALLOC
#@CW_CONFIG_HAVE__LIBC_MALLOC@ LIBCWD_HAVE__LIBC_MALLOC
#if defined(LIBCWD_HAVE___LIBC_MALLOC) || defined(LIBCWD_HAVE__LIBC_MALLOC)
-#define DEBUGMALLOCEXTERNALCLINKAGE
+#define LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
#endif
#endif
#ifdef DEBUGUSEBFD
-#@CW_CONFIG_HAVE_DLOPEN@ CWDEBUG_DLOPEN_DEFINED
+#@CW_CONFIG_HAVE_DLOPEN@ LIBCWD_DLOPEN_DEFINED
#endif
#@CW_CONFIG_THREAD_SAFE@ LIBCWD_THREAD_SAFE
Index: src/libcwd/include/libcw/debugmalloc.h
diff -u src/libcwd/include/libcw/debugmalloc.h:1.30 src/libcwd/include/libcw/debugmalloc.h:1.31
--- src/libcwd/include/libcw/debugmalloc.h:1.30 Sun Feb 17 17:24:47 2002
+++ src/libcwd/include/libcw/debugmalloc.h Tue Feb 19 19:55:52 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debugmalloc.h,v 1.30 2002/02/18 01:24:47 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/debugmalloc.h,v 1.31 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -113,9 +113,9 @@
#endif // !DEBUGMALLOC
#ifdef DEBUGDEBUGMALLOC
-#define DEBUGDEBUGMALLOC_CERR(x) DEBUGDEBUG_CERR(x)
+#define LIBCWD_DEBUGM_CERR(x) DEBUGDEBUG_CERR(x)
#else
-#define DEBUGDEBUGMALLOC_CERR(x)
+#define LIBCWD_DEBUGM_CERR(x)
#endif
namespace libcw {
@@ -133,7 +133,7 @@
#ifndef DEBUGMALLOC_INTERNAL
#ifdef DEBUGMALLOC
-#ifndef DEBUGMALLOCEXTERNALCLINKAGE
+#ifndef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
// Ugh, use kludge.
#include <cstdlib> // Make sure the prototypes for malloc et al are declared
// before defining the macros!
@@ -145,7 +145,7 @@
// Use external linkage to catch ALL calls to all malloc/calloc/realloc/free functions,
// also those that are done in libc, or any other shared library that might be linked.
-// [ Note: if DEBUGMALLOCEXTERNALCLINKAGE wasn't defined, then these are the prototypes
+// [ Note: if LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC wasn't defined, then these are the prototypes
// for __libcwd_malloc et al of course. We still use external "C" linkage in that case
// in order to avoid a collision with possibily later included prototypes for malloc. ]
#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
@@ -159,7 +159,7 @@
#endif
extern "C" void free(void* ptr) throw();
-#ifndef DEBUGMALLOCEXTERNALCLINKAGE
+#ifndef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
// Use same kludge for other libc functions that return malloc-ed pointers.
#define strdup __libcwd_strdup
#ifdef HAVE_WMEMCPY
@@ -200,7 +200,7 @@
return p;
}
#endif // HAVE_WMEMCPY
-#endif // !DEBUGMALLOCEXTERNALCLINKAGE
+#endif // !LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
#endif // DEBUGMALLOC
#endif // !DEBUG_INTERNAL
Index: src/libcwd/include/libcw/macro_AllocTag.h
diff -u src/libcwd/include/libcw/macro_AllocTag.h:1.8 src/libcwd/include/libcw/macro_AllocTag.h:1.9
--- src/libcwd/include/libcw/macro_AllocTag.h:1.8 Sun Feb 17 17:24:47 2002
+++ src/libcwd/include/libcw/macro_AllocTag.h Tue Feb 19 19:55:52 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/macro_AllocTag.h,v 1.8 2002/02/18 01:24:47 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/macro_AllocTag.h,v 1.9 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -57,7 +57,7 @@
extern void set_alloc_label(void const* ptr, type_info_ct const& ti, lockable_auto_ptr<char, true> description);
// For dynamic descriptions
// allocated with new[]
-#ifndef DEBUGMALLOCEXTERNALCLINKAGE
+#ifndef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
extern void register_external_allocation(void const* ptr, size_t size);
#endif
@@ -210,7 +210,7 @@
*/
#define NEW(x) __libcwd_allocCatcher(new x)
-#ifndef DEBUGMALLOCEXTERNALCLINKAGE
+#ifndef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
/**
* \brief Register an externally allocated memory block at position \a ptr with size \a size.
*/
@@ -229,7 +229,7 @@
#define AllocTag1(p)
#define AllocTag2(p, desc)
#define NEW(x) new x
-#ifndef DEBUGMALLOCEXTERNALCLINKAGE
+#ifndef LIBCWD_USE_EXTERNAL_C_LINKAGE_FOR_MALLOC
#define RegisterExternalAlloc(p, s)
#endif
Index: src/libcwd/include/libcw/macro_Libcwd_macros.h
diff -u src/libcwd/include/libcw/macro_Libcwd_macros.h:1.6 src/libcwd/include/libcw/macro_Libcwd_macros.h:1.7
--- src/libcwd/include/libcw/macro_Libcwd_macros.h:1.6 Sun Feb 10 19:00:24 2002
+++ src/libcwd/include/libcw/macro_Libcwd_macros.h Tue Feb 19 19:55:52 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/macro_Libcwd_macros.h,v 1.6 2002/02/11 03:00:24 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/macro_Libcwd_macros.h,v 1.7 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2000 - 2002, by
//
@@ -52,17 +52,17 @@
//
// This is debugging libcwd itself.
-#ifndef DEBUGDEBUGLIBCWDOUTMARKER
+#ifndef LIBCWD_LibcwDoutScopeBegin_MARKER
#ifdef DEBUGDEBUGOUTPUT
extern "C" ssize_t write(int fd, const void *buf, size_t count) throw();
#define LIBCWD_STR1(x) #x
#define LIBCWD_STR2(x) LIBCWD_STR1(x)
#define LIBCWD_STR3 "LibcwDout at " __FILE__ ":" LIBCWD_STR2(__LINE__) "\n"
-#define DEBUGDEBUGLIBCWDOUTMARKER LibcwDebugThreads( ++__libcwd_tsd.internal_debugging_code ); ::write(2, LIBCWD_STR3, sizeof(LIBCWD_STR3) - 1); LibcwDebugThreads( --__libcwd_tsd.internal_debugging_code );
+#define LIBCWD_LibcwDoutScopeBegin_MARKER LibcwDebugThreads( ++__libcwd_tsd.internal_debugging_code ); ::write(2, LIBCWD_STR3, sizeof(LIBCWD_STR3) - 1); LibcwDebugThreads( --__libcwd_tsd.internal_debugging_code );
#else // !DEBUGDEBUGOUTPUT
-#define DEBUGDEBUGLIBCWDOUTMARKER
+#define LIBCWD_LibcwDoutScopeBegin_MARKER
#endif // !DEBUGDEBUGOUTPUT
-#endif // !DEBUGDEBUGLIBCWDOUTMARKER
+#endif // !LIBCWD_LibcwDoutScopeBegin_MARKER
/**
* \brief General debug output macro.
@@ -81,7 +81,7 @@
do \
{ \
LIBCWD_TSD_DECLARATION \
- DEBUGDEBUGLIBCWDOUTMARKER \
+ LIBCWD_LibcwDoutScopeBegin_MARKER \
if (LIBCWD_DO_TSD_MEMBER_OFF(debug_obj) < 0) \
{ \
using namespace ::libcw::debug; \
@@ -111,14 +111,14 @@
//
// This is debugging libcwd itself.
-#ifndef DEBUGDEBUGLIBCWDOUTFATALMARKER
+#ifndef LIBCWD_LibcwDoutFatalScopeBegin_MARKER
#ifdef DEBUGDEBUGOUTPUT
#define LIBCWD_STR4 "LibcwDoutFatal at " __FILE__ ":" LIBCWD_STR2(__LINE__) "\n"
-#define DEBUGDEBUGLIBCWDOUTFATALMARKER LibcwDebugThreads( ++__libcwd_tsd.internal_debugging_code ); ::write(2, LIBCWD_STR4, sizeof(LIBCWD_STR4) - 1); LibcwDebugThreads( --__libcwd_tsd.internal_debugging_code );
+#define LIBCWD_LibcwDoutFatalScopeBegin_MARKER LibcwDebugThreads( ++__libcwd_tsd.internal_debugging_code ); ::write(2, LIBCWD_STR4, sizeof(LIBCWD_STR4) - 1); LibcwDebugThreads( --__libcwd_tsd.internal_debugging_code );
#else
-#define DEBUGDEBUGLIBCWDOUTFATALMARKER
+#define LIBCWD_LibcwDoutFatalScopeBegin_MARKER
#endif
-#endif // !DEBUGDEBUGLIBCWDOUTFATALMARKER
+#endif // !LIBCWD_LibcwDoutFatalScopeBegin_MARKER
/**
* \brief General fatal debug output macro.
@@ -137,7 +137,7 @@
do \
{ \
LIBCWD_TSD_DECLARATION \
- DEBUGDEBUGLIBCWDOUTFATALMARKER \
+ LIBCWD_LibcwDoutFatalScopeBegin_MARKER \
using namespace ::libcw::debug; \
::libcw::debug::channel_set_bootstrap_st __libcwd_channel_set(LIBCWD_DO_TSD(debug_obj) LIBCWD_COMMA_TSD); \
{ \
Index: src/libcwd/include/libcw/private_allocator.h
diff -u src/libcwd/include/libcw/private_allocator.h:1.5 src/libcwd/include/libcw/private_allocator.h:1.6
--- src/libcwd/include/libcw/private_allocator.h:1.5 Sun Feb 17 17:24:47 2002
+++ src/libcwd/include/libcw/private_allocator.h Tue Feb 19 19:55:52 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/private_allocator.h,v 1.5 2002/02/18 01:24:47 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/private_allocator.h,v 1.6 2002/02/20 03:55:52 libcw Exp $
//
// Copyright (C) 2001 - 2002, by
//
@@ -227,13 +227,13 @@
#define LIBCWD_DEBUGDEBUG_COMMA(x)
#endif
-#define DEFAULT_ALLOC_USERSPACE(instance) ::libcw::debug::_private_:: \
+#define LIBCWD_DEFAULT_ALLOC_USERSPACE(instance) ::libcw::debug::_private_:: \
allocator_adaptor<char, \
::std::alloc, \
false \
LIBCWD_DEBUGDEBUG_COMMA(::libcw::debug::_private_::instance)>
-#define DEFAULT_ALLOC_INTERNAL(instance) ::libcw::debug::_private_:: \
+#define LIBCWD_DEFAULT_ALLOC_INTERNAL(instance) ::libcw::debug::_private_:: \
allocator_adaptor<char, \
::std::__default_alloc_template \
< ::libcw::debug::_private_::instance == \
@@ -249,25 +249,25 @@
// libcwd mutex instance. Using a macro here instead of another template in order not to bloat the
// mangling TOO much.
#define LIBCWD_NS_INTERNAL_ALLOCATOR(instance) \
- DEFAULT_ALLOC_INTERNAL(instance)
+ LIBCWD_DEFAULT_ALLOC_INTERNAL(instance)
#else // !LIBCWD_THREAD_SAFE
// In a single threaded application, the Non_shared case is equivalent to the Single Threaded case.
#define LIBCWD_NS_INTERNAL_ALLOCATOR(instance) \
- DEFAULT_ALLOC_INTERNAL(single_threaded_internal_instance)
+ LIBCWD_DEFAULT_ALLOC_INTERNAL(single_threaded_internal_instance)
#endif // !LIBCWD_THREAD_SAFE
#ifdef LIBCWD_THREAD_SAFE
// LIBCWD_MT_*_ALLOCATOR uses an different allocator than the normal default allocator of libstdc++
// in the case of multi-threading because it can be that the allocator mutex is locked, which would
// result in a deadlock if we try to use it again here.
-#define LIBCWD_MT_INTERNAL_ALLOCATOR DEFAULT_ALLOC_INTERNAL(multi_threaded_internal_instance)
-#define LIBCWD_MT_USERSPACE_ALLOCATOR DEFAULT_ALLOC_USERSPACE(multi_threaded_userspace_instance)
+#define LIBCWD_MT_INTERNAL_ALLOCATOR LIBCWD_DEFAULT_ALLOC_INTERNAL(multi_threaded_internal_instance)
+#define LIBCWD_MT_USERSPACE_ALLOCATOR LIBCWD_DEFAULT_ALLOC_USERSPACE(multi_threaded_userspace_instance)
#else // !LIBCWD_THREAD_SAFE
// LIBCWD_MT_*_ALLOCATOR uses the normal default allocator of libstdc++-v3 (alloc) using locking
// itself. The userspace allocator shares it memory pool with everything else (that uses this
// allocator, which is most of the (userspace) STL).
-#define LIBCWD_MT_INTERNAL_ALLOCATOR DEFAULT_ALLOC_INTERNAL(single_threaded_internal_instance)
-#define LIBCWD_MT_USERSPACE_ALLOCATOR DEFAULT_ALLOC_USERSPACE(single_threaded_userspace_instance)
+#define LIBCWD_MT_INTERNAL_ALLOCATOR LIBCWD_DEFAULT_ALLOC_INTERNAL(single_threaded_internal_instance)
+#define LIBCWD_MT_USERSPACE_ALLOCATOR LIBCWD_DEFAULT_ALLOC_USERSPACE(single_threaded_userspace_instance)
#endif // !LIBCWD_THREAD_SAFE
//---------------------------------------------------------------------------------------------------
----------------------- End of diff -----------------------
|
