Changeset 12388

Timestamp:

Apr 27, 2011, 8:41:47 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) heap pruning: avoid unnecessary malloc+memcpy+frees in announcer.

1. when creating announce URLs in announcer-http.c
2. when creating scrape URLs in announcer-http.c
3. when deep-logging what announces are in a torrent's queue in announcer.c

Location:

trunk/libtransmission

Files:

• announcer-http.c (modified) (8 diffs)
• announcer.c (modified) (2 diffs)

trunk/libtransmission/announcer-http.c

@@ -51 +51 @@
 }
 
-static char*
+static struct evbuffer *
 announce_url_new( const tr_session * session, const tr_announce_request * req )
 {
@@ -117 +117 @@
     }
 
-    return evbuffer_free_to_str( buf );
+    return buf;
 }
 
@@ -280 +280 @@
 {
     struct announce_data * d;
-    char * url = announce_url_new( session, request );
+    struct evbuffer * buf = announce_url_new( session, request );
+    const char * url = (const char *) evbuffer_pullup( buf, -1 );
 
     d = tr_new0( struct announce_data, 1 );
@@ -290 +291 @@
     dbgmsg( request->log_name, "Sending announce to libcurl: \"%s\"", url );
     tr_webRun( session, url, NULL, NULL, on_announce_done, d );
-    tr_free( url );
+
+    evbuffer_free( buf );
 }
 
@@ -399 +401 @@
 }
 
-static char*
+static struct evbuffer *
 scrape_url_new( const tr_scrape_request * req )
 {
@@ -416 +418 @@
     }
 
-    return evbuffer_free_to_str( buf );
+    return buf;
 }
 
@@ -427 +429 @@
     int i;
     struct scrape_data * d;
-    char * url = scrape_url_new( request );
+    struct evbuffer * buf = scrape_url_new( request );
+    const char * url = (const char *) evbuffer_pullup( buf, -1 );
 
     d = tr_new0( struct scrape_data, 1 );
@@ -440 +443 @@
     dbgmsg( request->log_name, "Sending scrape to libcurl: \"%s\"", url );
     tr_webRun( session, url, NULL, NULL, on_scrape_done, d );
-    tr_free( url );
-}
+
+    evbuffer_free( buf );
+}

trunk/libtransmission/announcer.c

@@ -730 +730 @@
     {
         int i;
-        char * str;
         char name[128];
         struct evbuffer * buf = evbuffer_new( );
@@ -741 +740 @@
             evbuffer_add_printf( buf, "[%d:%s]", i, str );
         }
-        str = evbuffer_free_to_str( buf );
-        tr_deepLog( __FILE__, __LINE__, name, "announce queue is %s", str );
-        tr_free( str );
+
+        tr_deepLog( __FILE__, __LINE__, name, "announce queue is %s", evbuffer_pullup( buf, -1 ) );
+        evbuffer_free( buf );
     }
 }