Changeset 8134

Timestamp:

Apr 5, 2009, 1:00:17 PM (14 years ago)

Author:

charles

Message:

(trunk libT) re-add the curl "easy queue" from 1.4x to queue libcurl tasks to ameliorate complaints of "too many open files"

File:

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

trunk/libtransmission/web.c

@@ -73 +73 @@
     tr_session * session;
     struct event timer_event;
+    tr_list * easy_queue;
     tr_list * fds;
 };
@@ -215 +216 @@
             curl_easy_setopt( easy, CURLOPT_ENCODING, "" );
 
-        {
+        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 {
             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 ) );
@@ -323 +327 @@
     tr_timevalMsec( g->timer_ms, &interval );
     evtimer_add( &g->timer_event, &interval );
+}
+
+static void
+add_tasks_from_queue( tr_web * g )
+{
+    while( ( g->still_running < MAX_CONCURRENT_TASKS ) 
+        && ( tr_list_size( g->easy_queue ) > 0 ) )
+    {
+        CURL * easy = tr_list_pop_front( &g->easy_queue );
+        if( easy )
+        {
+            const CURLMcode rc = curl_multi_add_handle( g->multi, easy );
+            if( rc != CURLM_OK )
+                tr_err( "%s", curl_multi_strerror( rc ) );
+            else {
+                dbgmsg( "pumped the task queue, %d remain",
+                        tr_list_size( g->easy_queue ) );
+                ++g->still_running;
+            }
+        }
+    }
 }
 
@@ -372 +397 @@
 
     remove_finished_tasks( g );
+
+    add_tasks_from_queue( g );
 
     if( !g->still_running ) {