Menu
▾
▴
[libcw-cvs] [CVS] Module src
|
From: Carlo W. <li...@us...> - 2002-02-10 05:42:10
|
CVSROOT : /cvsroot/libcw
Module : src
Commit time: 2002-01-10 05:42:08 UTC
Modified files:
libcwd/debug.cc libcwd/maintMakefile.in libcwd/threading.cc
libcwd/include/libcw/private_struct_TSD.h
libcwd/testsuite/module.cc libcwd/testsuite/libcwd.tst/dlopen.re
Log message:
Several fixes, trying to get 'make full-check' working again.
---------------------- diff included ----------------------
Index: src/libcwd/debug.cc
diff -u src/libcwd/debug.cc:1.65 src/libcwd/debug.cc:1.66
--- src/libcwd/debug.cc:1.65 Sat Feb 9 18:42:16 2002
+++ src/libcwd/debug.cc Sat Feb 9 21:41:58 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/debug.cc,v 1.65 2002/02/10 02:42:16 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/debug.cc,v 1.66 2002/02/10 05:41:58 libcw Exp $
//
// Copyright (C) 2000 - 2001, by
//
@@ -285,7 +285,9 @@
channels::dc::system.NS_initialize("SYSTEM");
libcw_do.NS_init(); // Initialize debug code.
+#ifdef LIBCWD_THREAD_SAFE
libcw_do.keep_tsd(true);
+#endif
// Unlimit core size.
#ifdef RLIMIT_CORE
@@ -989,6 +991,7 @@
tsd_initialized = true;
}
+#ifdef LIBCWD_THREAD_SAFE
namespace _private_ {
void debug_tsd_init(LIBCWD_TSD_PARAM)
{
@@ -1002,6 +1005,7 @@
);
}
}
+#endif
debug_tsd_st::~debug_tsd_st()
{
Index: src/libcwd/include/libcw/private_struct_TSD.h
diff -u src/libcwd/include/libcw/private_struct_TSD.h:1.6 src/libcwd/include/libcw/private_struct_TSD.h:1.7
--- src/libcwd/include/libcw/private_struct_TSD.h:1.6 Wed Feb 6 16:38:38 2002
+++ src/libcwd/include/libcw/private_struct_TSD.h Sat Feb 9 21:41:58 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/private_struct_TSD.h,v 1.6 2002/02/07 00:38:38 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/include/libcw/private_struct_TSD.h,v 1.7 2002/02/10 05:41:58 libcw Exp $
//
// Copyright (C) 2001, by
//
@@ -157,8 +157,8 @@
int do_off_array[LIBCWD_DO_MAX]; // Thread Specific on/off counter for Debug Objects.
debug_tsd_st* do_array[LIBCWD_DO_MAX];// Thread Specific Data of Debug Objects or NULL when no debug object.
void cleanup_routine(void) throw();
-#endif
int off_cnt_array[LIBCWD_DC_MAX]; // Thread Specific Data of Debug Channels.
+#endif
void S_initialize(void) throw();
Index: src/libcwd/maintMakefile.in
diff -u src/libcwd/maintMakefile.in:1.19 src/libcwd/maintMakefile.in:1.20
--- src/libcwd/maintMakefile.in:1.19 Thu Jan 10 18:23:32 2002
+++ src/libcwd/maintMakefile.in Sat Feb 9 21:41:58 2002
@@ -104,12 +104,15 @@
@( \
for c in \
'--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debugm --enable-libcwd-debug --disable-libcwd-debug-output --compilers=3.0.3,2.96,2.95.3' \
+ '--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debugt --enable-libcwd-debugm --enable-libcwd-debug --disable-libcwd-debug-output --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-debugm --enable-libcwd-debug --disable-libcwd-debug-output --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debugm --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-debugm --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debug --disable-libcwd-debug-output --compilers=3.0.3,2.96,2.95.3' \
+ '--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debugt --enable-libcwd-debug --disable-libcwd-debug-output --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-debug --disable-libcwd-debug-output --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debugm --enable-libcwd-debug --compilers=3.0.3,2.96,2.95.3' \
+ '--enable-maintainer-mode --enable-libcwd-threading --enable-libcwd-debugt --enable-libcwd-debugm --enable-libcwd-debug --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-debugm --enable-libcwd-debug --compilers=3.0.3,2.96,2.95.3' \
'--enable-maintainer-mode --enable-libcwd-threading --compilers=3.0.3,3.0.2,3.0.1,2.96,2.95.3,2.95.2' \
'--enable-maintainer-mode --compilers=3.0.3,3.0.2,3.0.1,2.96,2.95.3,2.95.2' \
Index: src/libcwd/testsuite/libcwd.tst/dlopen.re
diff -u src/libcwd/testsuite/libcwd.tst/dlopen.re:1.10 src/libcwd/testsuite/libcwd.tst/dlopen.re:1.11
--- src/libcwd/testsuite/libcwd.tst/dlopen.re:1.10 Fri Jan 4 20:34:22 2002
+++ src/libcwd/testsuite/libcwd.tst/dlopen.re Sat Feb 9 21:41:58 2002
@@ -8,14 +8,14 @@
(.*
)*
MALLOC : malloc\(310\) = <unfinished>
-BFD : address 0x[0-9a-f]* corresponds to module.cc:16
+BFD : address 0x[0-9a-f]* corresponds to module.cc:19
MALLOC : <continued> 0x[0-9a-f]*
MALLOC : malloc\(300\) = <unfinished>
-BFD : address 0x[0-9a-f]* corresponds to module.cc:7
+BFD : address 0x[0-9a-f]* corresponds to module.cc:10
MALLOC : <continued> 0x[0-9a-f]*
MALLOC : Allocated memory: [0-9]* bytes in [0-9]* blocks\.
-malloc 0x[0-9a-f]* module\.cc:7 void\*; \(sz = 300\) Allocated inside static_test_symbol
-malloc 0x[0-9a-f]* module\.cc:16 void\*; \(sz = 310\) Allocated inside global_test_symbol
+malloc 0x[0-9a-f]* module\.cc:10 void\*; \(sz = 300\) Allocated inside static_test_symbol
+malloc 0x[0-9a-f]* module\.cc:19 void\*; \(sz = 310\) Allocated inside global_test_symbol
// input lines 2
// output till ^NOTICE
(malloc 0x[0-9a-f]* *(dl-[a-z]*\.c|stl_alloc\.h|specific\.c|dlerror\.c):[0-9]* *<unknown type>; \(sz = [0-9]*\)
Index: src/libcwd/testsuite/module.cc
diff -u src/libcwd/testsuite/module.cc:1.4 src/libcwd/testsuite/module.cc:1.5
--- src/libcwd/testsuite/module.cc:1.4 Thu Feb 7 20:03:47 2002
+++ src/libcwd/testsuite/module.cc Sat Feb 9 21:41:58 2002
@@ -1,5 +1,7 @@
// A shared library
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <libcw/sysd.h>
#include <libcw/debug.h>
Index: src/libcwd/threading.cc
diff -u src/libcwd/threading.cc:1.8 src/libcwd/threading.cc:1.9
--- src/libcwd/threading.cc:1.8 Thu Feb 7 20:03:46 2002
+++ src/libcwd/threading.cc Sat Feb 9 21:41:58 2002
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/l/li/libcw/src/libcwd/threading.cc,v 1.8 2002/02/08 04:03:46 libcw Exp $
+// $Header: /cvsroot/l/li/libcw/src/libcwd/threading.cc,v 1.9 2002/02/10 05:41:58 libcw Exp $
//
// Copyright (C) 2001, by
//
@@ -84,7 +84,7 @@
tid = pthread_self();
initialize_global_mutexes(); // This is a good moment to initialize all pthread mutexes.
mutex_tct<tsd_initialization_instance>::unlock();
- if (WST_multi_threaded) // Is this a second (or later) thread?
+ if (thread_index(pthread_self()) != 0) // Is this a second (or later) thread?
{
set_alloc_checking_off(*this);
for (int i = 0; i < LIBCWD_DO_MAX; ++i)
----------------------- End of diff -----------------------
|
