Changeset 7828 for trunk

Timestamp:

Feb 5, 2009, 2:52:00 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #1748: judging from Biiaru's testing yesterday after I left, the problem is somewhere in web.c. Let's start by adding some cruel assertions in there.

File:

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

trunk/libtransmission/web.c

@@ -159 +159 @@
 #endif
         {
-            const CURLMcode rc = curl_multi_add_handle( web->multi, easy );
-            if( rc == CURLM_OK )
+            const CURLMcode mcode = curl_multi_add_handle( web->multi, easy );
+            tr_assert( mcode == CURLM_OK, "curl_multi_add_handle() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+            if( mcode == CURLM_OK )
                 ++web->still_running;
             else
-                tr_err( "%s", curl_multi_strerror( rc ) );
+                tr_err( "%s", curl_multi_strerror( mcode ) );
         }
     }
@@ -221 +222 @@
             long code;
             struct tr_web_task * task;
-            curl_easy_getinfo( easy, CURLINFO_PRIVATE, (void*)&task );
-            curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &code );
-            curl_multi_remove_handle( g->multi, easy );
+            CURLcode ecode;
+            CURLMcode mcode;
+            ecode = curl_easy_getinfo( easy, CURLINFO_PRIVATE, (void*)&task );
+            tr_assert( ecode == CURLE_OK, "curl_easy_getinfo() failed: %d (%s)", ecode, curl_easy_strerror( ecode ) );
+            ecode = curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &code );
+            tr_assert( ecode == CURLE_OK, "curl_easy_getinfo() failed: %d (%s)", ecode, curl_easy_strerror( ecode ) );
+            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 ) );
             curl_easy_cleanup( easy );
             task_finish( task, code );
@@ -284 +290 @@
 web_close( tr_web * g )
 {
+    CURLMcode mcode;
+
     stop_timer( g );
-    curl_multi_cleanup( g->multi );
+
+    mcode = curl_multi_cleanup( g->multi );
+    tr_assert( mcode == CURLM_OK, "curl_multi_cleanup() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+    if( mcode != CURLM_OK )
+        tr_err( "%s", curl_multi_strerror( mcode ) );
+
     tr_free( g );
 }
@@ -296 +309 @@
 {
     int closed = FALSE;
-    CURLMcode rc;
+    CURLMcode mcode;
 
     dbgmsg( "check_run_count: prev_running %d, still_running %d",
@@ -303 +316 @@
     /* invoke libcurl's processing */
     do {
-        rc = curl_multi_socket_action( g->multi, fd, 0, &g->still_running );
-        dbgmsg( "event_cb(): fd %d, still_running is %d",
-                fd, g->still_running );
-    } while( rc == CURLM_CALL_MULTI_PERFORM );
-    if( rc != CURLM_OK )
-        tr_err( "%s", curl_multi_strerror( rc ) );
+        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 );
+    } while( mcode == CURLM_CALL_MULTI_PERFORM );
+    tr_assert( mcode == CURLM_OK, "curl_multi_socket_action() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+    if( mcode != CURLM_OK )
+        tr_err( "%s", curl_multi_strerror( mcode ) );
 
     remove_finished_tasks( g );
@@ -382 +395 @@
          struct tr_web  * g )
 {
-    struct tr_web_sockinfo * f = tr_new0( struct tr_web_sockinfo, 1 );
+    CURLMcode mcode;
+    struct tr_web_sockinfo * f;
+
+    f = tr_new0( struct tr_web_sockinfo, 1 );
     dbgmsg( "creating a sockinfo %p for fd %d", f, sockfd );
     setsock( sockfd, action, g, f );
-    curl_multi_assign( g->multi, sockfd, f );
+
+    mcode = curl_multi_assign( g->multi, sockfd, f );
+    tr_assert( mcode == CURLM_OK, "curl_multi_assign() failed: %d (%s)", mcode, curl_multi_strerror( mcode ) );
+    if( mcode != CURLM_OK )
+        tr_err( "%s", curl_multi_strerror( mcode ) );
 }
 
@@ -462 +482 @@
 tr_webInit( tr_session * session )
 {
+    CURLMcode mcode;
     static int curlInited = FALSE;
     tr_web * web;
@@ -480 +501 @@
 
     evtimer_set( &web->timer_event, 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 );
+    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 ) );
 
     return web;