Changeset 12395

Timestamp:

Apr 28, 2011, 5:46:31 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) in peer-mgr.c's refillUpkeep(), allocate the temporary array outside of the loop instead of inside...

File:

• trunk/libtransmission/peer-mgr.c (modified) (4 diffs)

trunk/libtransmission/peer-mgr.c

@@ -1444 +1444 @@
     time_t too_old;
     tr_torrent * tor;
+    int cancel_buflen = 0;
+    struct block_request * cancel = NULL;
     tr_peerMgr * mgr = vmgr;
     managerLock( mgr );
@@ -1450 +1452 @@
     too_old = now - REQUEST_TTL_SECS;
 
+    /* alloc the temporary "cancel" buffer */
+    tor = NULL;
+    while(( tor = tr_torrentNext( mgr->session, tor )))
+        cancel_buflen = MAX( cancel_buflen, tor->torrentPeers->requestCount );
+    if( cancel_buflen > 0 )
+        cancel = tr_new( struct block_request, cancel_buflen );
+
+    /* prune requests that are too old */
     tor = NULL;
     while(( tor = tr_torrentNext( mgr->session, tor )))
@@ -1461 +1471 @@
             const struct block_request * it;
             const struct block_request * end;
-            struct block_request * cancel = tr_new( struct block_request, n );
 
             for( it=t->requests, end=it+n; it!=end; ++it )
@@ -1490 +1499 @@
             for( it=cancel, end=it+cancelCount; it!=end; ++it )
                 pieceListRemoveRequest( t, it->block );
-
-            /* cleanup loop */
-            tr_free( cancel );
         }
     }
 
+    tr_free( cancel );
     tr_timerAddMsec( mgr->refillUpkeepTimer, REFILL_UPKEEP_PERIOD_MSEC );
     managerUnlock( mgr );