Changeset 7811 for trunk

Timestamp:

Jan 28, 2009, 7:35:39 PM (13 years ago)

Author:

charles

Message:

(trunk libT) add more assertions to ensure that the libevent calls are all being made from the same thread

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (3 diffs)
• trevent.c (modified) (2 diffs)
• web.c (modified) (2 diffs)

trunk/libtransmission/peer-io.c

@@ -347 +347 @@
     tr_peerIo * io;
 
+    assert( session != NULL );
+    assert( session->events != NULL );
+    assert( tr_amInEventThread( session ) );
+
     if( socket >= 0 )
         tr_netSetTOS( socket, session->peerSocketTOS );
@@ -849 +853 @@
 {
     assert( tr_amInEventThread( io->session ) );
+    assert( io->session != NULL );
     assert( io->session->events != NULL );
     assert( event_initialized( &io->event_read ) );
@@ -872 +877 @@
 {
     assert( tr_amInEventThread( io->session ) );
+    assert( io->session != NULL );
     assert( io->session->events != NULL );
     assert( event_initialized( &io->event_read ) );

trunk/libtransmission/trevent.c

@@ -347 +347 @@
     tr_timer * timer;
 
-    assert( session );
-    assert( session->events );
+    assert( session != NULL );
+    assert( session->events != NULL );
 
     timer = tr_new0( tr_timer, 1 );
@@ -380 +380 @@
                      void func( void* ), void * user_data )
 {
-    assert( session );
-    assert( session->events );
+    assert( session != NULL );
+    assert( session->events != NULL );
 
     if( tr_amInThread( session->events->thread ) )

trunk/libtransmission/web.c

@@ -247 +247 @@
 {
     struct timeval interval;
+
+    assert( tr_amInEventThread( g->session ) );
+    assert( g->session != NULL );
+    assert( g->session->events != NULL );
+
     stop_timer( g );
     dbgmsg( "adding a timeout for %ld seconds from now", g->timer_ms/1000L );
@@ -358 +363 @@
                    | (( action & CURL_POLL_IN ) ? EV_READ : 0 )
                    | (( action & CURL_POLL_OUT ) ? EV_WRITE : 0 );
+
+    assert( tr_amInEventThread( g->session ) );
+    assert( g->session != NULL );
+    assert( g->session->events != NULL );
+
     dbgmsg( "setsock: fd is %d, curl action is %d, libevent action is %d",
             sockfd, action, kind );