Changeset 4042 for trunk/libtransmission/platform.c

Timestamp:

Dec 2, 2007, 6:20:37 PM (13 years ago)

Author:

charles

Message:

more mutex work

File:

• trunk/libtransmission/platform.c (modified) (3 diffs)

trunk/libtransmission/platform.c

@@ -242 +242 @@
 tr_lockLock( tr_lock * l )
 {
-    const tr_thread_id currentThread = tr_getCurrentThread( );
-
 #ifdef __BEOS__
     acquire_sem( l->lock );
@@ -251 +249 @@
     pthread_mutex_lock( &l->lock );
 #endif
-    l->lockThread = currentThread;
+    l->lockThread = tr_getCurrentThread( );
     ++l->depth;
+/* fprintf( stderr, "thread %lu acquired lock %p... depth is now %d\n", (unsigned long)l->lockThread, l, l->depth ); */
     assert( l->depth >= 1 );
 }
@@ -266 +265 @@
 tr_lockUnlock( tr_lock * l )
 {
+/* fprintf( stderr, "thread %lu releasing lock %p... depth before release is %d\n", (unsigned long)l->lockThread, l, l->depth ); */
+
     assert( l->depth > 0 );
     assert( tr_areThreadsEqual( l->lockThread, tr_getCurrentThread() ));
     assert( tr_lockHave( l ) );
 
-#ifdef __BEOS__
-    release_sem( l->lock );
-#elif defined(WIN32)
-    LeaveCriticalSection( &l->lock );
-#else
-    pthread_mutex_unlock( &l->lock );
-#endif
     --l->depth;
     assert( l->depth >= 0 );
+#ifdef __BEOS__
+    release_sem( l->lock );
+#elif defined(WIN32)
+    LeaveCriticalSection( &l->lock );
+#else
+    pthread_mutex_unlock( &l->lock );
+#endif
 }