Changeset 7535 for trunk/libtransmission/peer-msgs.c

Timestamp:

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

Author:

charles

Message:

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

File:

• trunk/libtransmission/peer-msgs.c (modified) (2 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,