Changeset 3232

Timestamp:

Sep 29, 2007, 2:19:23 PM (15 years ago)

Author:

charles

Message:

more work on the peer-mgr locks

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (1 diff)
• peer-mgr.c (modified) (8 diffs)

trunk/libtransmission/handshake.c

@@ -1085 +1085 @@
     handshake->doneUserData = doneUserData;
     handshake->handle = tr_peerIoGetHandle( io );
-
     handshake->startTimer = tr_timerNew( handshake->handle,
                                          handshakeStart,

trunk/libtransmission/peer-mgr.c

@@ -32 +32 @@
 #include "utils.h"
 
+#include "pthread.h"
+
 enum
 {
@@ -107 +109 @@
     tr_ptrArray * handshakes; /* in-process */
     tr_lock * lock;
-    uint8_t isLocked;
+    pthread_t lockThread;
 };
 
@@ -117 +119 @@
 managerLock( struct tr_peerMgr * manager )
 {
-    assert( !manager->isLocked );
+    assert( manager->lockThread != pthread_self() );
     tr_lockLock( manager->lock );
-    manager->isLocked = TRUE;
+    manager->lockThread = pthread_self();
 }
 static void
 managerUnlock( struct tr_peerMgr * manager )
 {
-    assert( manager->isLocked );
-    manager->isLocked = FALSE;
+    assert( manager->lockThread == pthread_self() );
+    manager->lockThread = 0;
     tr_lockUnlock( manager->lock );
 }
@@ -141 +143 @@
 torrentIsLocked( Torrent * t )
 {
-    return t!=NULL && t->manager!=NULL && t->manager->isLocked;
-}
-
-#define managerLock(a) fprintf(stderr,"%s:%d locking\n",__FILE__,__LINE__); managerLock(a);
+    return t!=NULL && t->manager!=NULL && t->manager->lockThread!=0;
+}
 
 /**
@@ -509 +509 @@
             setme->priority = inf->pieces[piece].priority;
             setme->peerCount = 0;
+            setme->fastAllowed = 0;
             /* FIXME */
 //            setme->fastAllowed = tr_bitfieldHas( t->tor->allowedList, i);
@@ -771 +772 @@
     Torrent * t = (Torrent *) vt;
     const tr_peermsgs_event * e = (const tr_peermsgs_event *) vevent;
-
-    torrentLock( t );
+    const int needLock = !torrentIsLocked( t );
+
+    if( needLock )
+        torrentLock( t );
 
     switch( e->eventType )
@@ -811 +814 @@
     }
 
-    torrentUnlock( t );
+    if( needLock )
+        torrentUnlock( t );
 }
 
@@ -895 +899 @@
     tr_handshake * handshake;
 
-    assert( manager->isLocked );
+    assert( manager->lockThread!=0 );
     assert( io != NULL );