Changeset 7790

Timestamp:

Jan 24, 2009, 2:49:35 PM (12 years ago)

Author:

charles

Message:

(trunk libT) experimental commit that will *possibly* fix the "assert( tr_isPeerIo( io ) )" crash reported by Biiaru and others

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (4 diffs)
• peer-io.h (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -192 +192 @@
 
     io->hasFinishedConnecting = TRUE;
+    io->pendingEvents &= ~EV_READ;
 
     curlen = EVBUFFER_LENGTH( io->inbuf );
@@ -274 +275 @@
 
     io->hasFinishedConnecting = TRUE;
+    io->pendingEvents &= ~EV_WRITE;
 
     dbgmsg( io, "libevent says this peer is ready to write" );
@@ -835 +837 @@
 event_enable( tr_peerIo * io, short event )
 {
-    if( event & EV_READ ) {
+    assert( event_initialized( &io->event_read ) );
+    assert( event_initialized( &io->event_write ) );
+
+    if( ( event & EV_READ ) && ! ( io->pendingEvents & EV_READ ) )
+    {
         dbgmsg( io, "enabling libevent ready-to-read polling" );
         event_add( &io->event_read, NULL );
-    }
-
-    if( event & EV_WRITE ) {
+        io->pendingEvents |= EV_READ;
+    }
+
+    if( ( event & EV_WRITE ) && ! ( io->pendingEvents & EV_WRITE ) )
+    {
         dbgmsg( io, "enabling libevent ready-to-write polling" );
         event_add( &io->event_write, NULL );
+        io->pendingEvents |= EV_WRITE;
     }
 }
@@ -849 +858 @@
 event_disable( struct tr_peerIo * io, short event )
 {
-    if( event & EV_READ ) {
+    assert( event_initialized( &io->event_read ) );
+    assert( event_initialized( &io->event_write ) );
+
+    if( ( event & EV_READ ) && ( io->pendingEvents & EV_READ ) )
+    {
         dbgmsg( io, "disabling libevent ready-to-read polling" );
         event_del( &io->event_read );
-    }
-
-    if( event & EV_WRITE ) {
+        io->pendingEvents &= ~EV_READ;
+    }
+
+    if( ( event & EV_WRITE ) && ( io->pendingEvents & EV_WRITE ) )
+    {
         dbgmsg( io, "disabling libevent ready-to-write polling" );
         event_del( &io->event_write );
+        io->pendingEvents &= ~EV_WRITE;
     }
 }

trunk/libtransmission/peer-io.h

@@ -70 +70 @@
     tr_bool               hasFinishedConnecting;
 
+    int                   pendingEvents;
+
     int                   magicNumber;