Fix confusing bug in printing of trace info for mutex_{try}lock.

Add a couple of other handy debug printings.

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

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 0048b0e0b8cf3184574ee4518aaa41d5a8efce2f..4109187c2bb652b93453178f5b5818bf9ee35506 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -144,9 +144,9 @@ static void do_nontrivial_clientreq ( ThreadId tid );
 static void scheduler_sanity ( void );
 
 static void do_pthread_mutex_unlock ( ThreadId, 
-                                      void* /* pthread_cond_t* */ );
+                                      void* /* pthread_mutex_t* */ );
 static void do_pthread_mutex_lock ( ThreadId, Bool, 
-                                    void* /* pthread_cond_t* */ );
+                                    void* /* pthread_mutex_t* */ );
 
 static void do_pthread_getspecific ( ThreadId,
                                      UInt /* pthread_key_t */ );
@@ -623,6 +623,7 @@ Bool maybe_do_trivial_clientreq ( ThreadId tid )
    UInt*        arg    = (UInt*)(tst->m_eax);
    UInt         req_no = arg[0];
 
+   /* VG_(printf)("req no = 0x%x\n", req_no); */
    switch (req_no) {
       case VG_USERREQ__MALLOC:
          SIMPLE_RETURN(
@@ -1324,7 +1325,10 @@ VgSchedReturnCode VG_(scheduler) ( void )
          }
 
          if (trc == VG_TRC_EBP_JMP_CLIENTREQ) {
-            Bool done = maybe_do_trivial_clientreq(tid);
+            Bool done; 
+            /* VG_(printf)("request 0x%x\n", 
+                           *(UInt*)(vg_threads[tid].m_eax)); */
+            done = maybe_do_trivial_clientreq(tid);
             if (done) {
                /* The request is done.  We try and continue with the
                   same thread if still runnable.  If not, go back to
@@ -1891,8 +1895,8 @@ void do_pthread_mutex_lock( ThreadId tid,
 {
    Char  msg_buf[100];
    Char* caller
-      = is_trylock ? "pthread_mutex_lock   "
-                   : "pthread_mutex_trylock";
+      = is_trylock ? "pthread_mutex_trylock"
+                   : "pthread_mutex_lock   ";
 
    pthread_mutex_t* mutex = (pthread_mutex_t*)mutexV;
 

diff --git a/vg_scheduler.c b/vg_scheduler.c
index 0048b0e0b8cf3184574ee4518aaa41d5a8efce2f..4109187c2bb652b93453178f5b5818bf9ee35506 100644 (file)
--- a/vg_scheduler.c
+++ b/vg_scheduler.c
@@ -144,9 +144,9 @@ static void do_nontrivial_clientreq ( ThreadId tid );
 static void scheduler_sanity ( void );
 
 static void do_pthread_mutex_unlock ( ThreadId, 
-                                      void* /* pthread_cond_t* */ );
+                                      void* /* pthread_mutex_t* */ );
 static void do_pthread_mutex_lock ( ThreadId, Bool, 
-                                    void* /* pthread_cond_t* */ );
+                                    void* /* pthread_mutex_t* */ );
 
 static void do_pthread_getspecific ( ThreadId,
                                      UInt /* pthread_key_t */ );
@@ -623,6 +623,7 @@ Bool maybe_do_trivial_clientreq ( ThreadId tid )
    UInt*        arg    = (UInt*)(tst->m_eax);
    UInt         req_no = arg[0];
 
+   /* VG_(printf)("req no = 0x%x\n", req_no); */
    switch (req_no) {
       case VG_USERREQ__MALLOC:
          SIMPLE_RETURN(
@@ -1324,7 +1325,10 @@ VgSchedReturnCode VG_(scheduler) ( void )
          }
 
          if (trc == VG_TRC_EBP_JMP_CLIENTREQ) {
-            Bool done = maybe_do_trivial_clientreq(tid);
+            Bool done; 
+            /* VG_(printf)("request 0x%x\n", 
+                           *(UInt*)(vg_threads[tid].m_eax)); */
+            done = maybe_do_trivial_clientreq(tid);
             if (done) {
                /* The request is done.  We try and continue with the
                   same thread if still runnable.  If not, go back to
@@ -1891,8 +1895,8 @@ void do_pthread_mutex_lock( ThreadId tid,
 {
    Char  msg_buf[100];
    Char* caller
-      = is_trylock ? "pthread_mutex_lock   "
-                   : "pthread_mutex_trylock";
+      = is_trylock ? "pthread_mutex_trylock"
+                   : "pthread_mutex_lock   ";
 
    pthread_mutex_t* mutex = (pthread_mutex_t*)mutexV;