Changeset 7645 for trunk/libtransmission/web.c

Timestamp:

Jan 8, 2009, 8:35:10 PM (12 years ago)

Author:

charles

Message:

(trunk libT) clear out the experimental code that accumulated while trying to find the fix to the tracker-announces-never-finish bug. This revision is 1.42's version plus bugfixes.

File:

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

trunk/libtransmission/web.c

@@ -25 +25 @@
 #include "web.h"
 
-enum
+enum 
 {
     /* arbitrary number */
-    MAX_CONCURRENT_TASKS = 100,
+    MAX_CONCURRENT_TASKS = 24,
 
     /* arbitrary number */
-    DEFAULT_TIMER_MSEC = 2500
+    DEFAULT_TIMER_MSEC = 2000
 };
 
@@ -50 +50 @@
 struct tr_web
 {
-    tr_bool closing;
+    tr_bool isClosing;
     int prev_running;
     int still_running;
@@ -56 +56 @@
     CURLM * multi;
     tr_session * session;
-#if 0
     tr_list * easy_queue;
-#endif
     struct event timer_event;
 };
@@ -126 +124 @@
         }
 
-        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 3600L );
-        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 120L );
+        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 360L );
+        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 60L );
         curl_easy_setopt( easy, CURLOPT_FOLLOWLOCATION, 1L );
+        curl_easy_setopt( easy, CURLOPT_MAXREDIRS, 16L );
         curl_easy_setopt( easy, CURLOPT_NOSIGNAL, 1L );
         curl_easy_setopt( easy, CURLOPT_PRIVATE, task );
@@ -145 +144 @@
             curl_easy_setopt( easy, CURLOPT_ENCODING, "" );
 
-#if 0
-        if( web->still_running >= MAX_CONCURRENT_TASKS )
-        {
+        if( web->still_running >= MAX_CONCURRENT_TASKS ) {
             tr_list_append( &web->easy_queue, easy );
             dbgmsg( " >> enqueueing a task ... size is now %d",
                                            tr_list_size( web->easy_queue ) );
-        }
-        else
-#endif
-        {
+        } else {
             const CURLMcode rc = curl_multi_add_handle( web->multi, easy );
             if( rc == CURLM_OK )
@@ -215 +209 @@
             curl_easy_getinfo( easy, CURLINFO_PRIVATE, (void*)&task );
             curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &code );
-            task_finish( task, code );
             curl_multi_remove_handle( g->multi, easy );
             curl_easy_cleanup( easy );
+            task_finish( task, code );
         }
     }
@@ -244 +238 @@
 }
 
-#if 0
 static void
 add_tasks_from_queue( tr_web * g )
@@ -265 +258 @@
     }
 }
-#endif
 
 static void
@@ -275 +267 @@
 }
 
-/* note: this function can free the tr_web if its 'closing' flag is set
+/* note: this function can free the tr_web if its 'isClosing' flag is set
    and no tasks remain.  callers must not reference their g pointer
    after calling this function */
@@ -298 +290 @@
     remove_finished_tasks( g );
 
-#if 0
     add_tasks_from_queue( g );
-#endif
 
     if( !g->still_running ) {
         stop_timer( g );
-        if( g->closing ) {
+        if( g->isClosing ) {
             web_close( g );
             closed = TRUE;
@@ -477 +467 @@
         web_close( web );
     else
-        web->closing = 1;
+        web->isClosing = 1;
 }