Changeset 7535

Timestamp:

Dec 30, 2008, 12:56:10 AM (12 years ago)

Author:

charles

Message:

(trunk libT) avoid a few more unnecessary malloc() + free() pairs

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (2 diffs)
• platform.h (modified) (1 diff)
• tracker.c (modified) (5 diffs)

trunk/libtransmission/peer-msgs.c

@@ -33 +33 @@
 #include "peer-mgr-private.h"
 #include "peer-msgs.h"
+#include "platform.h" /* MAX_STACK_ARRAY_SIZE */
 #include "ratecontrol.h"
 #include "stats.h"
@@ -1415 +1416 @@
         const size_t nLeft = req->length - EVBUFFER_LENGTH( msgs->incoming.block );
         size_t n = MIN( nLeft, inlen );
-        uint8_t * buf = tr_new( uint8_t, n );
-        assert( EVBUFFER_LENGTH( inbuf ) >= n );
-        tr_peerIoReadBytes( msgs->peer->io, inbuf, buf, n );
-        evbuffer_add( msgs->incoming.block, buf, n );
+        size_t i = n;
+
+        while( i > 0 )
+        {
+            uint8_t buf[MAX_STACK_ARRAY_SIZE];
+            const size_t thisPass = MIN( n, sizeof( buf ) );
+            tr_peerIoReadBytes( msgs->peer->io, inbuf, buf, thisPass );
+            evbuffer_add( msgs->incoming.block, buf, thisPass );
+            i -= thisPass;
+        }
+
         fireClientGotData( msgs, n, TRUE );
         *setme_piece_bytes_read += n;
-        tr_free( buf );
         dbgmsg( msgs, "got %zu bytes for block %u:%u->%u ... %d remain",
                n, req->index, req->offset, req->length,

trunk/libtransmission/platform.h

@@ -40 +40 @@
 #endif
 
-#define MAX_STACK_ARRAY_SIZE 8192
+#define MAX_STACK_ARRAY_SIZE 7168
 
 typedef struct tr_lock   tr_lock;

trunk/libtransmission/tracker.c

@@ -729 +729 @@
     int                 reqtype; /* TR_REQ_* */
     int                 torrentId;
-    char *              url;
-    tr_web_done_func *  done_func;
+    struct evbuffer   * url;
+    tr_web_done_func  * done_func;
     tr_session *        session;
 };
@@ -737 +737 @@
 freeRequest( struct tr_tracker_request * req )
 {
-    tr_free( req->url );
+    evbuffer_free( req->url );
     tr_free( req );
 }
@@ -807 +807 @@
     req->reqtype = reqtype;
     req->done_func =  isStopping ? onStoppedResponse : onTrackerResponse;
-    req->url = tr_strdup( EVBUFFER_DATA( url ) );
+    req->url = url;
     req->torrentId = tracker->torrentId;
 
-    evbuffer_free( url );
     return req;
 }
@@ -829 +828 @@
     req->session = session;
     req->reqtype = TR_REQ_SCRAPE;
-    req->url = tr_strdup( EVBUFFER_DATA( url ) );
+    req->url = url;
     req->done_func = onScrapeResponse;
     req->torrentId = tracker->torrentId;
 
-    evbuffer_free( url );
     return req;
 }
@@ -899 +897 @@
     ++req->session->tracker->runningCount;
 
-    tr_webRun( req->session, req->url, NULL,
+    tr_webRun( req->session,
+               (char*)EVBUFFER_DATA(req->url),
+               NULL,
                req->done_func, tr_int2ptr( req->torrentId ) );