Changeset 7866 for trunk

Timestamp:

Feb 10, 2009, 6:03:55 PM (13 years ago)

Author:

charles

Message:

(trunk libT) yet another possible fix for the libcurl/libevent/kqueue issue

File:

• trunk/libtransmission/web.c (modified) (5 diffs)

trunk/libtransmission/web.c

@@ -282 +282 @@
 
             mcode = curl_multi_remove_handle( g->multi, easy );
-            tr_assert( mcode == CURLM_OK, "curl_multi_socket_action() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+            tr_assert( mcode == CURLM_OK, "curl_multi_remove_handle() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
 
             curl_easy_cleanup( easy );
@@ -337 +337 @@
    after calling this function */
 static void
-tr_multi_socket_action( tr_web * g, int fd )
+tr_multi_perform( tr_web * g )
 {
     int closed = FALSE;
@@ -347 +347 @@
     /* invoke libcurl's processing */
     do {
-        mcode = curl_multi_socket_action( g->multi, fd, 0, &g->still_running );
-        dbgmsg( "event_cb(): fd %d, still_running is %d", fd, g->still_running );
+        dbgmsg( "calling curl_multi_perform..." );
+        mcode = curl_multi_perform( g->multi, &g->still_running );
+        dbgmsg( "done calling curl_multi_perform..." );
     } while( mcode == CURLM_CALL_MULTI_PERFORM );
-    if( ( mcode == CURLM_BAD_SOCKET ) && ( fd != CURL_SOCKET_TIMEOUT ) )
-        purgeSockinfo( g, fd );
-    else {
-        tr_assert( mcode == CURLM_OK, "curl_multi_socket_action() failed on fd %d: %d (%s)", fd, mcode, curl_multi_strerror( mcode ) );
-        if( mcode != CURLM_OK )
-            tr_err( "%s", curl_multi_strerror( mcode ) );
-    }
+    tr_assert( mcode == CURLM_OK, "curl_multi_perform() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+    if( mcode != CURLM_OK )
+        tr_err( "%s", curl_multi_strerror( mcode ) );
 
     remove_finished_tasks( g );
@@ -375 +372 @@
 /* libevent says that sock is ready to be processed, so wake up libcurl */
 static void
-event_cb( int fd, short kind UNUSED, void * g )
-{
-    tr_multi_socket_action( g, fd );
+event_cb( int fd UNUSED, short kind UNUSED, void * g )
+{
+    tr_multi_perform( g );
 }
 
@@ -385 +382 @@
 {
     dbgmsg( "libevent timer is done" );
-    tr_multi_socket_action( g, CURL_SOCKET_TIMEOUT );
+    tr_multi_perform( g );
 }