commit 30671ffd3e2823bb9cbeb34efdfff0812a877666
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Apr 21 00:13:57 2002 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Apr 21 00:13:57 2002 +0000
tree 3d312ca8781d55fecce709d40a3823d0de730e2b
parent 05553874941028e6cba49e7a821423e3d782d537

Add pthread_mutex_trylock, and add various other hacks to try and make
Mozilla work.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@107 a5019735-40e9-0310-863c-91ae7b9d1cf9

vg_scheduler.c

diff --git a/vg_scheduler.c b/vg_scheduler.c
index daf099b..90a9d9b 100644
--- a/vg_scheduler.c
+++ b/vg_scheduler.c
@@ -1703,12 +1703,17 @@
 
 
 static
-void do_pthread_mutex_lock( ThreadId tid, pthread_mutex_t *mutex )
+void do_pthread_mutex_lock( ThreadId tid, 
+                            Bool is_trylock, 
+                            pthread_mutex_t *mutex )
 {
-   Char msg_buf[100];
+   Char  msg_buf[100];
+   Char* caller
+      = is_trylock ? "pthread_mutex_lock   "
+                   : "pthread_mutex_trylock";
 
    if (VG_(clo_trace_pthread_level) >= 2) {
-      VG_(sprintf)(msg_buf, "pthread_mutex_lock       mx %p ...", mutex );
+      VG_(sprintf)(msg_buf, "%s    mx %p ...", caller, mutex );
       print_pthread_event(tid, msg_buf);
    }
 
@@ -1750,21 +1755,29 @@
                         tid, mutex, mutex->__m_count);
             return;
          } else {
-            vg_threads[tid].m_edx = EDEADLK;
+            if (is_trylock)
+               vg_threads[tid].m_edx = EBUSY;
+            else
+               vg_threads[tid].m_edx = EDEADLK;
             return;
          }
       } else {
          /* Someone else has it; we have to wait.  Mark ourselves
             thusly. */
          /* GUARD: __m_count > 0 && __m_owner is valid */
-         vg_threads[tid].status        = VgTs_WaitMX;
-         vg_threads[tid].associated_mx = mutex;
-         /* No assignment to %EDX, since we're blocking. */
-         if (VG_(clo_trace_pthread_level) >= 1) {
-            VG_(sprintf)(msg_buf, "pthread_mutex_lock       mx %p: BLOCK", 
-                                  mutex );
-            print_pthread_event(tid, msg_buf);
-         }
+         if (is_trylock) {
+            /* caller is polling; so return immediately. */
+            vg_threads[tid].m_edx = EBUSY;
+         } else {
+            vg_threads[tid].status        = VgTs_WaitMX;
+            vg_threads[tid].associated_mx = mutex;
+            /* No assignment to %EDX, since we're blocking. */
+            if (VG_(clo_trace_pthread_level) >= 1) {
+               VG_(sprintf)(msg_buf, "%s    mx %p: BLOCK", 
+                                     caller, mutex );
+               print_pthread_event(tid, msg_buf);
+            }
+	 }
          return;
       }
 
@@ -2064,7 +2077,11 @@
          break;
 
       case VG_USERREQ__PTHREAD_MUTEX_LOCK:
-         do_pthread_mutex_lock( tid, (pthread_mutex_t *)(arg[1]) );
+         do_pthread_mutex_lock( tid, False, (pthread_mutex_t *)(arg[1]) );
+         break;
+
+      case VG_USERREQ__PTHREAD_MUTEX_TRYLOCK:
+         do_pthread_mutex_lock( tid, True, (pthread_mutex_t *)(arg[1]) );
          break;
 
       case VG_USERREQ__PTHREAD_MUTEX_UNLOCK: