Changeset 9754

Timestamp:

Dec 14, 2009, 2:25:22 PM (12 years ago)

Author:

charles

Message:

(trunk libT) keep simplifying web.c... is there anything left to strip out?

File:

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

trunk/libtransmission/web.c

@@ -26 +26 @@
     DEFAULT_TIMER_MSEC = 1500 /* arbitrary */
 };
-
-static tr_bool tr_multi_perform( tr_web * g, int fd );
 
 #if 0
@@ -46 +44 @@
 {
     tr_bool closing;
+    tr_bool haveAddr;
     int taskCount;
     long timer_msec;
     CURLM * multi;
     tr_session * session;
-    tr_bool haveAddr;
     tr_address addr;
     struct event timer_event;
@@ -56 +54 @@
 
 static void
-web_close( tr_web * g )
+web_free( tr_web * g )
 {
     curl_multi_cleanup( g->multi );
@@ -194 +192 @@
         mcode = curl_multi_add_handle( web->multi, e );
         ++web->taskCount;
-        /*tr_multi_perform( web, CURL_SOCKET_TIMEOUT );*/
     }
 }
@@ -244 +241 @@
 }
 
-static tr_bool
+static void
 tr_multi_perform( tr_web * g, int fd )
 {
     CURLMcode mcode;
-    tr_bool closed = FALSE;
 
     dbgmsg( "check_run_count: %d taskCount", g->taskCount );
 
     /* invoke libcurl's processing */
-    do {
+    do
         mcode = curl_multi_socket_action( g->multi, fd, 0, &g->taskCount );
-    } while( mcode == CURLM_CALL_MULTI_SOCKET );
+    while( mcode == CURLM_CALL_MULTI_SOCKET );
 
     remove_finished_tasks( g );
 
-    if(( closed = g->closing && !g->taskCount ))
-        web_close( g );
+    if( g->closing && !g->taskCount )
+        web_free( g );
     else
         restart_timer( g );
-
-    return closed;
 }
 
@@ -276 +270 @@
 /* CURLMOPT_SOCKETFUNCTION */
 static int
-sock_cb( CURL * easy UNUSED, curl_socket_t fd, int action,
+sock_cb( CURL * e UNUSED, curl_socket_t fd, int action,
          void * vweb, void * vevent )
 {
@@ -282 +276 @@
     struct tr_web * web = vweb;
     struct event * io_event = vevent;
-    dbgmsg( "sock_cb: action is %d, fd is %d, io_event is %p",
-            action, (int)fd, io_event );
+    dbgmsg( "sock_cb: action %d, fd %d, io_event %p", action, (int)fd, io_event );
 
     if( action == CURL_POLL_REMOVE )
@@ -334 +327 @@
 {
     tr_web * g = vg;
-    tr_bool closed = FALSE;
-
-    if( timer_msec < 1 ) {
-        if( timer_msec == 0 ) /* call it immediately */
-            closed = tr_multi_perform( g, CURL_SOCKET_TIMEOUT );
-        timer_msec = DEFAULT_TIMER_MSEC;
-    }
-
-    if( !closed ) {
-        g->timer_msec = timer_msec;
-        restart_timer( g );
-    }
+
+    g->timer_msec = timer_msec > 0 ? timer_msec : DEFAULT_TIMER_MSEC;
+
+    if( timer_msec < 1 )
+        tr_multi_perform( g, CURL_SOCKET_TIMEOUT );
 }
 
@@ -370 +356 @@
         task->tag = ++tag;
         task->response = evbuffer_new( );
-
         tr_runInEventThread( session, addTask, task );
     }
@@ -412 +397 @@
     *web_in = NULL;
     if( web->taskCount < 1 )
-        web_close( web );
+        web_free( web );
     else
         web->closing = 1;
@@ -473 +458 @@
 
 void
-tr_http_escape( struct evbuffer  * out, const char * str, int len, tr_bool escape_slashes )
+tr_http_escape( struct evbuffer  * out,
+                const char * str, int len, tr_bool escape_slashes )
 {
     int i;