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.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6456

diff --git a/coregrind/m_tooliface.c b/coregrind/m_tooliface.c
index 6d4f2437a3ff432112231f91c23590272fd83cf1..87a0a42734cbfefa9c59daa98ca15690848b229c 100644 (file)
--- a/coregrind/m_tooliface.c
+++ b/coregrind/m_tooliface.c
@@ -327,10 +327,6 @@ DEF(track_stop_client_code,      ThreadId, ULong)
 DEF(track_post_thread_create,    ThreadId, ThreadId)
 DEF(track_post_thread_join,      ThreadId, ThreadId)
 
-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)
 

diff --git a/coregrind/pub_core_tooliface.h b/coregrind/pub_core_tooliface.h
index a8151cdadd9e67f34fd10b76f56d45251e31a221..e0acbf2624b16d627acfe600612ed1a3c54e323b 100644 (file)
--- a/coregrind/pub_core_tooliface.h
+++ b/coregrind/pub_core_tooliface.h
@@ -206,10 +206,6 @@ typedef struct {
    void (*track_post_thread_create)(ThreadId, ThreadId);
    void (*track_post_thread_join)  (ThreadId, ThreadId);
 
-   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);
 

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index f4ef59185ac5ce6c58dbe2e0b322b0ec559e041b..18a2cb1740aa14d3acc65b24ca8305c5f4156d94 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -3456,9 +3456,12 @@ static void hg_pre_clo_init(void)
    VG_(track_post_thread_create)  (& hg_thread_create);
    VG_(track_post_thread_join)    (& hg_thread_join);
 
+   /* 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);
+   */
 
    for (i = 0; i < LOCKSET_HASH_SZ; i++)
       lockset_hash[i] = NULL;

diff --git a/include/pub_tool_tooliface.h b/include/pub_tool_tooliface.h
index f2f7c845341ab1780c833a8e95b12d4998ffd275..45c7b4f44982cf2dc0ea0aceb3c97d9a3aeffce3 100644 (file)
--- a/include/pub_tool_tooliface.h
+++ b/include/pub_tool_tooliface.h
@@ -564,21 +564,6 @@ void VG_(track_post_thread_create)(void(*f)(ThreadId tid, ThreadId child));
 void VG_(track_post_thread_join)  (void(*f)(ThreadId joiner, ThreadId joinee));
 
 
-/* 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 corresponding
-   pre_mutex_unlock, because unlocking can't block).  */
-void VG_(track_post_mutex_unlock)(void(*f)(ThreadId tid, Addr mutex));
-
 /* Signal events (not exhaustive)
 
    ... pre_send_signal, post_send_signal ...