Changeset 9959

Timestamp:

Jan 17, 2010, 7:21:04 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2416 "crash in event_queue_insert()" -- this crash is definitely happening when we call event_del() twice on the same event without an event dispatch pass between the two calls. Start nailing down every possible case where that could happen in libtransmission

File:

• trunk/libtransmission/peer-io.c (modified) (6 diffs)

trunk/libtransmission/peer-io.c

@@ -440 +440 @@
 }
 
+/***
+****
+***/
+
+static void
+event_enable( tr_peerIo * io, short event )
+{
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session != NULL );
+    assert( io->session->events != NULL );
+    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 );
+        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;
+    }
+}
+
+static void
+event_disable( struct tr_peerIo * io, short event )
+{
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session != NULL );
+    assert( io->session->events != NULL );
+    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 );
+        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;
+    }
+}
+
+void
+tr_peerIoSetEnabled( tr_peerIo    * io,
+                     tr_direction   dir,
+                     tr_bool        isEnabled )
+{
+    const short event = dir == TR_UP ? EV_WRITE : EV_READ;
+
+    assert( tr_isPeerIo( io ) );
+    assert( tr_isDirection( dir ) );
+    assert( tr_amInEventThread( io->session ) );
+    assert( io->session->events != NULL );
+
+    if( isEnabled )
+        event_enable( io, event );
+    else
+        event_disable( io, event );
+}
+
+/***
+****
+***/
+
 static void
 trDatatypeFree( void * data )
@@ -457 +531 @@
 
     dbgmsg( io, "in tr_peerIo destructor" );
-    event_del( &io->event_read );
-    event_del( &io->event_write );
+    event_disable( io, ~0 );
     tr_bandwidthDestruct( &io->bandwidth );
     evbuffer_free( io->outbuf );
@@ -553 +626 @@
 tr_peerIoReconnect( tr_peerIo * io )
 {
+    int pendingEvents;
     tr_session * session;
 
@@ -559 +633 @@
 
     session = tr_peerIoGetSession( io );
+
+    pendingEvents = io->pendingEvents;
+    event_disable( io, ~0 );
 
     if( io->socket >= 0 )
@@ -564 +641 @@
 
     io->socket = tr_netOpenPeerSocket( session, &io->addr, io->port, io->isSeed );
+    event_set( &io->event_read, io->socket, EV_READ, event_read_cb, io );
+    event_set( &io->event_write, io->socket, EV_WRITE, event_write_cb, io );
+    event_enable( io, pendingEvents );
+
     if( io->socket >= 0 )
     {
@@ -909 +990 @@
     return tr_peerIoFlush( io, TR_UP, byteCount );
 }
-
-
-/***
-****
-****/
-
-static void
-event_enable( tr_peerIo * io, short event )
-{
-    assert( tr_amInEventThread( io->session ) );
-    assert( io->session != NULL );
-    assert( io->session->events != NULL );
-    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 );
-        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;
-    }
-}
-
-static void
-event_disable( struct tr_peerIo * io, short event )
-{
-    assert( tr_amInEventThread( io->session ) );
-    assert( io->session != NULL );
-    assert( io->session->events != NULL );
-    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 );
-        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;
-    }
-}
-
-
-void
-tr_peerIoSetEnabled( tr_peerIo    * io,
-                     tr_direction   dir,
-                     tr_bool        isEnabled )
-{
-    const short event = dir == TR_UP ? EV_WRITE : EV_READ;
-
-    assert( tr_isPeerIo( io ) );
-    assert( tr_isDirection( dir ) );
-    assert( tr_amInEventThread( io->session ) );
-    assert( io->session->events != NULL );
-
-    if( isEnabled )
-        event_enable( io, event );
-    else
-        event_disable( io, event );
-}