Author: bart
Date: 2008-02-28 19:06:34 +0000 (Thu, 28 Feb 2008)
New Revision: 7499
Log:
Eliminated the upper bound on the number of client-side mutexes.
Modified:
trunk/exp-drd/Makefile.am
trunk/exp-drd/drd_main.c
trunk/exp-drd/drd_mutex.c
trunk/exp-drd/drd_mutex.h
trunk/exp-drd/drd_suppression.c
trunk/exp-drd/tests/tc20_verifywrap.stderr.exp2
Modified: trunk/exp-drd/Makefile.am
===================================================================
--- trunk/exp-drd/Makefile.am 2008-02-28 18:03:49 UTC (rev 7498)
+++ trunk/exp-drd/Makefile.am 2008-02-28 19:06:34 UTC (rev 7499)
@@ -69,6 +69,7 @@
DRD_SOURCES_COMMON = \
drd_barrier.c \
drd_bitmap.c \
+ drd_clientobj.c \
drd_clientreq.c \
drd_cond.c \
drd_error.c \
@@ -84,6 +85,7 @@
noinst_HEADERS = \
drd_barrier.h \
drd_bitmap.h \
+ drd_clientobj.h \
drd_clientreq.h \
drd_cond.h \
drd_error.h \
Modified: trunk/exp-drd/drd_main.c
===================================================================
--- trunk/exp-drd/drd_main.c 2008-02-28 18:03:49 UTC (rev 7498)
+++ trunk/exp-drd/drd_main.c 2008-02-28 19:06:34 UTC (rev 7499)
@@ -25,6 +25,7 @@
#include "drd_barrier.h"
#include "drd_clientreq.h"
+#include "drd_clientobj.h"
#include "drd_cond.h"
#include "drd_error.h"
#include "drd_malloc_wrappers.h"
@@ -275,7 +276,7 @@
VG_(clo_backtrace_size));
}
thread_stop_using_mem(a1, a2);
- mutex_stop_using_mem(a1, a2);
+ drd_clientobj_stop_using_mem(a1, a2);
cond_stop_using_mem(a1, a2);
semaphore_stop_using_mem(a1, a2);
barrier_stop_using_mem(a1, a2);
@@ -835,6 +836,8 @@
drd_clientreq_init();
drd_suppression_init();
+
+ drd_clientobj_init();
}
Modified: trunk/exp-drd/drd_mutex.c
===================================================================
--- trunk/exp-drd/drd_mutex.c 2008-02-28 18:03:49 UTC (rev 7498)
+++ trunk/exp-drd/drd_mutex.c 2008-02-28 19:06:34 UTC (rev 7499)
@@ -23,30 +23,17 @@
*/
+#include "drd_clientobj.h"
#include "drd_error.h"
#include "drd_mutex.h"
-#include "drd_suppression.h"
#include "priv_drd_clientreq.h"
#include "pub_tool_errormgr.h" // VG_(maybe_record_error)()
#include "pub_tool_libcassert.h" // tl_assert()
-#include "pub_tool_libcprint.h" // VG_(printf)()
+#include "pub_tool_libcprint.h" // VG_(message)()
#include "pub_tool_machine.h" // VG_(get_IP)()
#include "pub_tool_threadstate.h" // VG_(get_running_tid)()
-// Type definitions.
-
-struct mutex_info
-{
- Addr mutex; // Pointer to client mutex.
- SizeT size; // Size in bytes of client-side object.
- MutexT mutex_type; // pthread_mutex_t or pthread_spinlock_t.
- int recursion_count; // 0 if free, >= 1 if locked.
- DrdThreadId owner; // owner if locked, last owner if free.
- VectorClock vc; // vector clock associated with last unlock.
-};
-
-
// Local functions.
static Bool mutex_is_locked(struct mutex_info* const p);
@@ -57,7 +44,6 @@
static Bool s_trace_mutex;
static ULong s_mutex_lock_count;
-struct mutex_info s_mutex[256];
// Function definitions.
@@ -76,13 +62,10 @@
{
tl_assert(mutex != 0);
tl_assert(size > 0);
-#if 0
- tl_assert(mutex_type == mutex_type_mutex
- || mutex_type == mutex_type_spinlock);
-#endif
- p->mutex = mutex;
- p->size = size;
+ tl_assert(p->a1 == mutex);
+ tl_assert(p->a2 == mutex + size);
+ p->cleanup = (void(*)(DrdClientobj*))&mutex_destroy;
p->mutex_type = mutex_type;
p->recursion_count = 0;
p->owner = DRD_INVALID_THREADID;
@@ -95,49 +78,31 @@
const SizeT size,
const MutexT mutex_type)
{
- int i;
+ struct mutex_info* p;
-#if 0
- tl_assert(mutex_type == mutex_type_mutex
- || mutex_type == mutex_type_spinlock);
-#endif
-
- for (i = 0; i < sizeof(s_mutex)/sizeof(s_mutex[0]); i++)
+ tl_assert(offsetof(DrdClientobj, mutex) == 0);
+ p = &drd_clientobj_get(mutex, ClientMutex)->mutex;
+ if (p)
{
- if (s_mutex[i].mutex == mutex)
- {
- if (s_mutex[i].mutex_type != mutex_type)
- {
- VG_(message)(Vg_DebugMsg, "??? mutex %p: type changed from %d into %d",
- s_mutex[i].mutex, s_mutex[i].mutex_type, mutex_type);
- }
- tl_assert(s_mutex[i].mutex_type == mutex_type);
- tl_assert(s_mutex[i].size == size);
- return &s_mutex[i];
- }
+ tl_assert(p->mutex_type == mutex_type);
+ tl_assert(p->a2 - p->a1 == size);
+ return p;
}
- for (i = 0; i < sizeof(s_mutex)/sizeof(s_mutex[0]); i++)
+
+ if (drd_clientobj_present(mutex, mutex + size))
{
- if (s_mutex[i].mutex == 0)
- {
- if (drd_is_any_suppressed(mutex, mutex + size))
- {
- GenericErrInfo GEI;
- VG_(maybe_record_error)(VG_(get_running_tid)(),
- GenericErr,
- VG_(get_IP)(VG_(get_running_tid)()),
- "Not a mutex",
- &GEI);
- return 0;
- }
- mutex_initialize(&s_mutex[i], mutex, size, mutex_type);
- drd_start_suppression(mutex, mutex + size,
- mutex_get_typename(&s_mutex[i]));
- return &s_mutex[i];
- }
+ GenericErrInfo GEI;
+ VG_(maybe_record_error)(VG_(get_running_tid)(),
+ GenericErr,
+ VG_(get_IP)(VG_(get_running_tid)()),
+ "Not a mutex",
+ &GEI);
+ return 0;
}
- tl_assert(0);
- return 0;
+
+ p = &drd_clientobj_add(mutex, mutex + size, ClientMutex)->mutex;
+ mutex_initialize(p, mutex, size, mutex_type);
+ return p;
}
struct mutex_info*
@@ -156,17 +121,12 @@
mutex);
}
-#if 0
- tl_assert(mutex_type == mutex_type_mutex
- || mutex_type == mutex_type_spinlock);
-#endif
-
mutex_p = mutex_get(mutex);
if (mutex_p)
{
const ThreadId vg_tid = VG_(get_running_tid)();
MutexErrInfo MEI
- = { mutex_p->mutex, mutex_p->recursion_count, mutex_p->owner };
+ = { mutex_p->a1, mutex_p->recursion_count, mutex_p->owner };
VG_(maybe_record_error)(vg_tid,
MutexErr,
VG_(get_IP)(vg_tid),
@@ -189,12 +149,12 @@
"drd_pre_mutex_destroy tid = %d/%d, %s 0x%lx",
vg_tid, drd_tid,
mutex_get_typename(p),
- p->mutex);
+ p->a1);
}
if (mutex_is_locked(p))
{
- MutexErrInfo MEI = { p->mutex, p->recursion_count, p->owner };
+ MutexErrInfo MEI = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(VG_(get_running_tid)(),
MutexErr,
VG_(get_IP)(VG_(get_running_tid)()),
@@ -202,10 +162,7 @@
&MEI);
}
- drd_finish_suppression(p->mutex, p->mutex + p->size);
-
- vc_cleanup(&p->vc);
- p->mutex = 0;
+ drd_clientobj_remove(p->a1);
}
void mutex_pre_destroy(struct mutex_info* const p)
@@ -224,7 +181,7 @@
if (mutex_get_recursion_count(mutex) > 0)
{
const ThreadId vg_tid = VG_(get_running_tid)();
- MutexErrInfo MEI = { p->mutex, p->recursion_count, p->owner };
+ MutexErrInfo MEI = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(vg_tid,
MutexErr,
VG_(get_IP)(vg_tid),
@@ -237,11 +194,8 @@
struct mutex_info* mutex_get(const Addr mutex)
{
- int i;
- for (i = 0; i < sizeof(s_mutex)/sizeof(s_mutex[0]); i++)
- if (s_mutex[i].mutex == mutex)
- return &s_mutex[i];
- return 0;
+ tl_assert(offsetof(DrdClientobj, mutex) == 0);
+ return &drd_clientobj_get(mutex, ClientMutex)->mutex;
}
/** Called before pthread_mutex_lock() is invoked. If a data structure for
@@ -266,7 +220,7 @@
&& p->recursion_count >= 1
&& mutex_type != mutex_type_recursive_mutex)
{
- MutexErrInfo MEI = { p->mutex, p->recursion_count, p->owner };
+ MutexErrInfo MEI = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(VG_(get_running_tid)(),
MutexErr,
VG_(get_IP)(VG_(get_running_tid)()),
@@ -325,7 +279,7 @@
#endif
tl_assert(p->mutex_type == mutex_type);
- tl_assert(p->size == size);
+ tl_assert(p->a2 - p->a1 == size);
if (p->recursion_count == 0)
{
@@ -338,7 +292,7 @@
"The impossible happened: mutex 0x%lx is locked"
" simultaneously by two threads (recursion count %d,"
" owners %d and %d) !",
- p->mutex, p->recursion_count, p->owner, drd_tid);
+ p->a1, p->recursion_count, p->owner, drd_tid);
p->owner = drd_tid;
}
p->recursion_count++;
@@ -404,7 +358,7 @@
if (p->owner == DRD_INVALID_THREADID)
{
- MutexErrInfo MEI = { p->mutex, p->recursion_count, p->owner };
+ MutexErrInfo MEI = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(vg_tid,
MutexErr,
VG_(get_IP)(vg_tid),
@@ -417,7 +371,7 @@
if (p->mutex_type != mutex_type)
{
VG_(message)(Vg_DebugMsg, "??? mutex %p: type changed from %d into %d",
- p->mutex, p->mutex_type, mutex_type);
+ p->a1, p->mutex_type, mutex_type);
}
tl_assert(p->mutex_type == mutex_type);
tl_assert(p->owner != DRD_INVALID_THREADID);
@@ -428,7 +382,7 @@
if (p->owner != drd_tid)
{
- MutexErrInfo MEI = { p->mutex, p->recursion_count, p->owner };
+ MutexErrInfo MEI = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(vg_tid,
MutexErr,
VG_(get_IP)(vg_tid),
@@ -439,7 +393,7 @@
if (p->recursion_count < 0)
{
MutexErrInfo MEI
- = { p->mutex, p->recursion_count, p->owner };
+ = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(vg_tid,
MutexErr,
VG_(get_IP)(vg_tid),
@@ -523,14 +477,15 @@
*/
void mutex_thread_delete(const DrdThreadId tid)
{
- int i;
- for (i = 0; i < sizeof(s_mutex)/sizeof(s_mutex[0]); i++)
+ struct mutex_info* p;
+
+ drd_clientobj_resetiter();
+ for ( ; (p = &drd_clientobj_next(ClientMutex)->mutex) != 0; )
{
- struct mutex_info* const p = &s_mutex[i];
- if (p->mutex && p->owner == tid && p->recursion_count > 0)
+ if (p->owner == tid && p->recursion_count > 0)
{
MutexErrInfo MEI
- = { p->mutex, p->recursion_count, p->owner };
+ = { p->a1, p->recursion_count, p->owner };
VG_(maybe_record_error)(VG_(get_running_tid)(),
MutexErr,
VG_(get_IP)(VG_(get_running_tid)()),
@@ -541,19 +496,6 @@
}
}
-void mutex_stop_using_mem(const Addr a1, const Addr a2)
-{
- unsigned i;
- for (i = 0; i < sizeof(s_mutex)/sizeof(s_mutex[0]); i++)
- {
- if (a1 <= s_mutex[i].mutex && s_mutex[i].mutex < a2)
- {
- tl_assert(s_mutex[i].mutex + s_mutex[i].size <= a2);
- mutex_destroy(&s_mutex[i]);
- }
- }
-}
-
ULong get_mutex_lock_count(void)
{
return s_mutex_lock_count;
Modified: trunk/exp-drd/drd_mutex.h
===================================================================
--- trunk/exp-drd/drd_mutex.h 2008-02-28 18:03:49 UTC (rev 7498)
+++ trunk/exp-drd/drd_mutex.h 2008-02-28 19:06:34 UTC (rev 7499)
@@ -54,7 +54,6 @@
const VectorClock* mutex_get_last_vc(const Addr mutex);
int mutex_get_recursion_count(const Addr mutex);
void mutex_thread_delete(const DrdThreadId tid);
-void mutex_stop_using_mem(const Addr a1, const Addr a2);
ULong get_mutex_lock_count(void);
Modified: trunk/exp-drd/drd_suppression.c
===================================================================
--- trunk/exp-drd/drd_suppression.c 2008-02-28 18:03:49 UTC (rev 7498)
+++ trunk/exp-drd/drd_suppression.c 2008-02-28 19:06:34 UTC (rev 7499)
@@ -75,12 +75,14 @@
}
tl_assert(a1 < a2);
+#if 0
if (! drd_is_suppressed(a1, a2))
{
VG_(message)(Vg_DebugMsg, "?? not suppressed ??");
VG_(get_and_pp_StackTrace)(VG_(get_running_tid)(), 12);
tl_assert(False);
}
+#endif
bm_clear(s_suppressed, a1, a2);
}
Modified: trunk/exp-drd/tests/tc20_verifywrap.stderr.exp2
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap.stderr.exp2 2008-02-28 18:03:49 UTC
(rev 7498)
+++ trunk/exp-drd/tests/tc20_verifywrap.stderr.exp2 2008-02-28 19:06:34 UTC
(rev 7499)
@@ -24,6 +24,14 @@
at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:102)
+Destroying locked mutex: address 0x........, recursion count 1, owner 1.
+ at 0x........: pthread_mutex_destroy (drd_intercepts.c:?)
+ by 0x........: main (tc20_verifywrap.c:102)
+
+Invalid mutex
+ at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
+ by 0x........: main (tc20_verifywrap.c:125)
+
Mutex not locked: address 0x........, recursion count 0, owner 0.
at 0x........: pthread_mutex_unlock (drd_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:125)
@@ -67,4 +75,4 @@
Destroying locked mutex: address 0x........, recursion count 1, owner 1.
at 0x........: main (tc20_verifywrap.c:262)
-ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 8 errors from 8 contexts (suppressed: 0 from 0)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
