Changeset 9710

Timestamp:

Dec 10, 2009, 7:05:21 PM (12 years ago)

Author:

charles

Message:

(trunk libT) use curl_multi_socket_action(), even on OS X.

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (1 diff)
• web.c (modified) (12 diffs)

trunk/libtransmission/announcer.c

@@ -732 +732 @@
 {
     return ( announce != NULL )
+        && ( strstr( announce, "tracker.thepiratebay.org" ) == NULL ) /* dead */
         && ( ( strstr( announce, "http://" ) == announce ) ||
              ( strstr( announce, "https://" ) == announce ) );

trunk/libtransmission/web.c

@@ -28 +28 @@
 #include "web.h"
 
-static tr_bool
-useCurlMultiSocketAction( void )
-{
-    static tr_bool tested = FALSE;
-    static tr_bool useMultiSocketAction;
-
-    if( !tested )
-    {
-#ifdef SYS_DARWIN /* for some reason, curl_multi_socket_action() + libevent
-                     keeps crashing in event_queue_insert() on OS X 10.5 & 10.6 */
-        useMultiSocketAction = FALSE;
-#else
-        curl_version_info_data * data = curl_version_info( CURLVERSION_NOW );
-        tr_inf( "Using libcurl %s", data->version );
-        /* Use curl_multi_socket_action() instead of curl_multi_perform()
-         * if libcurl >= 7.18.2.  See http://trac.transmissionbt.com/ticket/1844 */
-        useMultiSocketAction = data->version_num >= 0x071202;
-#endif
-        tested = TRUE;
-    }
-
-    return useMultiSocketAction;
-}
-
 enum
 {
     /* arbitrary number */
-    DEFAULT_TIMER_MSEC = 2500
+    DEFAULT_TIMER_MSEC = 1500
 };
+
+static void
+tr_multi_perform( tr_web * g, int fd );
 
 #if 0
@@ -84 +63 @@
     int prev_running;
     int still_running;
-    long timer_ms;
+    long timer_msec;
     CURLM * multi;
     tr_session * session;
@@ -279 +258 @@
             else
                 tr_err( "%s", curl_multi_strerror( mcode ) );
+
+            tr_multi_perform( web, CURL_SOCKET_TIMEOUT );
         }
     }
@@ -372 +353 @@
 restart_timer( tr_web * g )
 {
-    struct timeval interval;
-
     assert( tr_amInEventThread( g->session ) );
     assert( g->session != NULL );
@@ -379 +358 @@
 
     stop_timer( g );
-    dbgmsg( "adding a timeout for %.1f seconds from now", g->timer_ms/1000.0 );
-    tr_timevalMsec( g->timer_ms, &interval );
-    evtimer_add( &g->timer_event, &interval );
+    dbgmsg( "adding a timeout for %.1f seconds from now", g->timer_msec/1000.0 );
+    tr_timerAddMsec( &g->timer_event, g->timer_msec );
 }
 
@@ -412 +390 @@
 
     /* invoke libcurl's processing */
-    if( useCurlMultiSocketAction( ) )
-    {
-        do {
-            dbgmsg( "calling curl_multi_socket_action..." );
-            mcode = curl_multi_socket_action( g->multi, fd, 0, &g->still_running );
-            fd = CURL_SOCKET_TIMEOUT;
-            dbgmsg( "done calling curl_multi_socket_action..." );
-        } while( mcode == CURLM_CALL_MULTI_SOCKET );
-    }
-    else
-    {
-        do {
-            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 );
-    }
+    do {
+        dbgmsg( "calling curl_multi_socket_action..." );
+        mcode = curl_multi_socket_action( g->multi, fd, 0, &g->still_running );
+        fd = CURL_SOCKET_TIMEOUT;
+        dbgmsg( "done calling curl_multi_socket_action..." );
+    } while( mcode == CURLM_CALL_MULTI_SOCKET );
     tr_assert( mcode == CURLM_OK, "curl_multi_perform() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
     if( mcode != CURLM_OK )
@@ -453 +420 @@
 {
     tr_multi_perform( g, fd );
-}
-
-/* libevent says that timer_ms have passed, so wake up libcurl */
-static void
-timer_cb( int socket UNUSED, short action UNUSED, void * g )
-{
-    dbgmsg( "libevent timer is done" );
-    tr_multi_perform( g, CURL_SOCKET_TIMEOUT );
 }
 
@@ -501 +460 @@
 }
 
+/* libevent says that timer_msec have passed, so wake up libcurl */
+static void
+libevent_timer_cb( int fd UNUSED, short what UNUSED, void * g )
+{
+    dbgmsg( "libevent timer is done" );
+    tr_multi_perform( g, CURL_SOCKET_TIMEOUT );
+}
 
 /* libcurl documentation: "If 0, it means you should proceed immediately
@@ -507 +473 @@
  * before you call curl_multi_perform() again."  */
 static void
-multi_timer_cb( CURLM *multi UNUSED, long timer_ms, void * vg )
+multi_timer_cb( CURLM * multi UNUSED, long timer_msec, void * vg )
 {
     tr_web * g = vg;
 
-    if( timer_ms < 1 ) {
-        if( timer_ms == 0 ) /* call it immediately */
-            timer_cb( 0, 0, g );
-        timer_ms = DEFAULT_TIMER_MSEC;
-    }
-
-    g->timer_ms = timer_ms;
+    if( timer_msec < 1 ) {
+        if( timer_msec == 0 ) /* call it immediately */
+            libevent_timer_cb( 0, 0, g );
+        timer_msec = DEFAULT_TIMER_MSEC;
+    }
+
+    g->timer_msec = timer_msec;
     restart_timer( g );
 }
@@ -534 +500 @@
     if( session->web )
     {
+        struct tr_web_task * task;
         static unsigned long tag = 0;
-        struct tr_web_task * task;
 
         task = tr_new0( struct tr_web_task, 1 );
@@ -560 +526 @@
 tr_webInit( tr_session * session )
 {
-    CURLMcode mcode;
+    tr_web * web;
     static int curlInited = FALSE;
-    tr_web * web;
 
     /* call curl_global_init if we haven't done it already.
@@ -576 +541 @@
     web->multi = curl_multi_init( );
     web->session = session;
-    web->timer_ms = DEFAULT_TIMER_MSEC; /* overwritten by multi_timer_cb() */
-
-    evtimer_set( &web->timer_event, timer_cb, web );
-    mcode = curl_multi_setopt( web->multi, CURLMOPT_SOCKETDATA, web );
-    tr_assert( mcode == CURLM_OK, "curl_mutli_setopt() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
-    mcode = curl_multi_setopt( web->multi, CURLMOPT_SOCKETFUNCTION, sock_cb );
-    tr_assert( mcode == CURLM_OK, "curl_mutli_setopt() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
-    mcode = curl_multi_setopt( web->multi, CURLMOPT_TIMERDATA, web );
-    tr_assert( mcode == CURLM_OK, "curl_mutli_setopt() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
-    mcode = curl_multi_setopt( web->multi, CURLMOPT_TIMERFUNCTION, multi_timer_cb );
-    tr_assert( mcode == CURLM_OK, "curl_mutli_setopt() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+    web->timer_msec = DEFAULT_TIMER_MSEC; /* overwritten by multi_timer_cb() */
+
+    evtimer_set( &web->timer_event, libevent_timer_cb, web );
+    curl_multi_setopt( web->multi, CURLMOPT_SOCKETDATA, web );
+    curl_multi_setopt( web->multi, CURLMOPT_SOCKETFUNCTION, sock_cb );
+    curl_multi_setopt( web->multi, CURLMOPT_TIMERDATA, web );
+    curl_multi_setopt( web->multi, CURLMOPT_TIMERFUNCTION, multi_timer_cb );
 
     return web;