Changeset 3267

Timestamp:

Oct 2, 2007, 2:59:07 AM (15 years ago)

Author:

charles

Message:

threads. gotta love 'em.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (1 diff)
• torrent.c (modified) (3 diffs)

trunk/libtransmission/peer-io.c

@@ -76 +76 @@
 canReadWrapper( struct bufferevent * e, void * userData )
 {
+    int done = 0;
     tr_peerIo * c = (tr_peerIo *) userData;
+    tr_handle * handle = c->handle;
 
     if( c->canRead == NULL )
         return;
 
-    for( ;; ) {
+    tr_globalLock( handle );
+
+    while( !done )
+    {
         const int ret = (*c->canRead)( e, c->userData );
-        switch( ret ) {
-            case READ_AGAIN: if( EVBUFFER_LENGTH( e->input ) ) continue; /* note fall-through */
-            case READ_MORE: tr_peerIoSetIOMode( c, EV_READ, 0 ); return; break;
-            case READ_DONE: return;
+
+        switch( ret )
+        {
+            case READ_AGAIN:
+                if( EVBUFFER_LENGTH( e->input ) )
+                    continue;
+            case READ_MORE:
+                tr_peerIoSetIOMode( c, EV_READ, 0 );
+            case READ_DONE:
+                done = 1;
         }
     }
+
+    tr_globalUnlock( handle );
 }
 

trunk/libtransmission/torrent.c

@@ -1045 +1045 @@
 }
 
-static void
-tr_torrentStopImpl( void * vtor )
-{
-    tr_torrent * tor = vtor;
+void
+tr_torrentStop( tr_torrent * tor )
+{
+    tr_globalLock( tor->handle );
 
     switch( tor->runStatus )
@@ -1070 +1070 @@
             break;
     }
-}
-
-void
-tr_torrentStop( tr_torrent * tor )
-{
-    tr_torrentStopImpl( tor );
+
+    tr_globalUnlock( tor->handle );
 }
 
@@ -1081 +1077 @@
 tr_torrentClose( tr_torrent * tor )
 {
+    tr_globalLock( tor->handle );
+
     tor->runStatusToSave = tor->runStatus;
     tor->runStatusToSaveIsSet = TRUE;
     tr_torrentStop( tor );
     tr_timerNew( tor->handle, freeWhenStopped, tor, 250 );
+
+    tr_globalUnlock( tor->handle );
 }