|
From: <sv...@va...> - 2006-12-28 20:26:12
|
Author: sewardj
Date: 2006-12-28 20:26:08 +0000 (Thu, 28 Dec 2006)
New Revision: 6456
Log:
Get rid of the core-tool events pre_mutex_lock, post_mutex_lock and
post_mutex_unlock. The core can't detect them anyway any more, so
there's no point in having them.
Modified:
trunk/coregrind/m_tooliface.c
trunk/coregrind/pub_core_tooliface.h
trunk/helgrind/hg_main.c
trunk/include/pub_tool_tooliface.h
Modified: trunk/coregrind/m_tooliface.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_tooliface.c 2006-12-28 17:42:37 UTC (rev 6455)
+++ trunk/coregrind/m_tooliface.c 2006-12-28 20:26:08 UTC (rev 6456)
@@ -327,10 +327,6 @@
DEF(track_post_thread_create, ThreadId, ThreadId)
DEF(track_post_thread_join, ThreadId, ThreadId)
=20
-DEF(track_pre_mutex_lock, ThreadId, Addr)
-DEF(track_post_mutex_lock, ThreadId, Addr)
-DEF(track_post_mutex_unlock, ThreadId, Addr)
-
DEF(track_pre_deliver_signal, ThreadId, Int sigNo, Bool)
DEF(track_post_deliver_signal, ThreadId, Int sigNo)
=20
Modified: trunk/coregrind/pub_core_tooliface.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/pub_core_tooliface.h 2006-12-28 17:42:37 UTC (rev 645=
5)
+++ trunk/coregrind/pub_core_tooliface.h 2006-12-28 20:26:08 UTC (rev 645=
6)
@@ -206,10 +206,6 @@
void (*track_post_thread_create)(ThreadId, ThreadId);
void (*track_post_thread_join) (ThreadId, ThreadId);
=20
- void (*track_pre_mutex_lock) (ThreadId, Addr);
- void (*track_post_mutex_lock) (ThreadId, Addr);
- void (*track_post_mutex_unlock)(ThreadId, Addr);
-
void (*track_pre_deliver_signal) (ThreadId, Int sigNo, Bool);
void (*track_post_deliver_signal)(ThreadId, Int sigNo);
=20
Modified: trunk/helgrind/hg_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/helgrind/hg_main.c 2006-12-28 17:42:37 UTC (rev 6455)
+++ trunk/helgrind/hg_main.c 2006-12-28 20:26:08 UTC (rev 6456)
@@ -3456,9 +3456,12 @@
VG_(track_post_thread_create) (& hg_thread_create);
VG_(track_post_thread_join) (& hg_thread_join);
=20
+ /* The core doesn't provide these events any more */
+ /*
VG_(track_pre_mutex_lock) (& hg_pre_mutex_lock);
VG_(track_post_mutex_lock) (& hg_post_mutex_lock);
VG_(track_post_mutex_unlock) (& hg_post_mutex_unlock);
+ */
=20
for (i =3D 0; i < LOCKSET_HASH_SZ; i++)
lockset_hash[i] =3D NULL;
Modified: trunk/include/pub_tool_tooliface.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/include/pub_tool_tooliface.h 2006-12-28 17:42:37 UTC (rev 6455)
+++ trunk/include/pub_tool_tooliface.h 2006-12-28 20:26:08 UTC (rev 6456)
@@ -564,21 +564,6 @@
void VG_(track_post_thread_join) (void(*f)(ThreadId joiner, ThreadId jo=
inee));
=20
=20
-/* Mutex events (not exhaustive)
- "void *mutex" is really a pthread_mutex *
-
- Called before a thread can block while waiting for a mutex (called
- regardless of whether the thread will block or not). */
-void VG_(track_pre_mutex_lock)(void(*f)(ThreadId tid, Addr mutex));
-
-/* Called once the thread actually holds the mutex (always paired with
- pre_mutex_lock). */
-void VG_(track_post_mutex_lock)(void(*f)(ThreadId tid, Addr mutex));
-
-/* Called after a thread has released a mutex (no need for a correspondi=
ng
- pre_mutex_unlock, because unlocking can't block). */
-void VG_(track_post_mutex_unlock)(void(*f)(ThreadId tid, Addr mutex));
-
/* Signal events (not exhaustive)
=20
... pre_send_signal, post_send_signal ...
|