Changeset 12001

Timestamp:

Feb 21, 2011, 1:13:28 AM (12 years ago)

Author:

jordan

Message:

(trunk libT) web.c: free the unprocessed tasks before exiting the libcurl thread.

This is rare but can happen during shutdown if there are unresponsive trackers. Cleaning up the tasks improves the S/N ratio in valgrind a bit.

File:

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

trunk/libtransmission/web.c

@@ -293 +293 @@
 tr_webThreadFunc( void * vsession )
 {
-    int unused;
     CURLM * multi;
     struct tr_web * web;
     int taskCount = 0;
+    struct tr_web_task * task;
     tr_session * session = vsession;
 
@@ -314 +314 @@
     {
         long msec;
+        int unused;
         CURLMsg * msg;
         CURLMcode mcode;
-        struct tr_web_task * task;
 
         if( web->close_mode == TR_WEB_CLOSE_NOW )
@@ -389 +389 @@
             }
         }
+    }
+
+    /* Discard any remaining tasks.
+     * This is rare, but can happen on shutdown with unresponsive trackers. */
+    while(( task = tr_list_pop_front( &web->tasks ))) {
+        dbgmsg( "Discarding task \"%s\"", task->url );
+        task_free( task );
     }