Improve testcoverage in the rec-mutex test
authorMatthias Clasen <mclasen@redhat.com>
Tue, 4 Oct 2011 04:44:58 +0000 (00:44 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 4 Oct 2011 04:44:58 +0000 (00:44 -0400)
Test g_rec_mutex_trylock() in both locked and unlocked cases.

glib/tests/rec-mutex.c

index c8d5a35..5f3abcc 100644 (file)
@@ -77,13 +77,13 @@ acquire (gint nr)
 
   self = g_thread_self ();
 
-  if (owners[nr] != NULL && owners[nr] != self)
+  if (!g_rec_mutex_trylock (&locks[nr]))
     {
       if (g_test_verbose ())
         g_print ("thread %p going to block on lock %d\n", self, nr);
-    }
 
-  g_rec_mutex_lock (&locks[nr]);
+      g_rec_mutex_lock (&locks[nr]);
+    }
 
   g_assert (owners[nr] == NULL);   /* hopefully nobody else is here */
   owners[nr] = self;