Changeset 7545

Timestamp:

Dec 30, 2008, 8:20:16 AM (12 years ago)

Author:

charles

Message:

(trunk libT) remove obsolete tr_peerMgr.c's getConnectedPeers()

File:

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

trunk/libtransmission/peer-mgr.c

@@ -496 +496 @@
 }
 
-static tr_peer**
-getConnectedPeers( Torrent * t, int * setmeCount )
-{
-    int i, peerCount, connectionCount;
-    tr_peer **peers;
-    tr_peer **ret;
-
-    assert( torrentIsLocked( t ) );
-
-    peers = (tr_peer **) tr_ptrArrayPeek( &t->peers, &peerCount );
-    ret = tr_new( tr_peer *, peerCount );
-
-    for( i = connectionCount = 0; i < peerCount; ++i )
-        if( peers[i]->msgs )
-            ret[connectionCount++] = peers[i];
-
-    *setmeCount = connectionCount;
-    return ret;
-}
-
 static int
 clientIsDownloadingFrom( const tr_peer * peer )
@@ -639 +619 @@
     tr_piece_index_t  * pool = tr_new( tr_piece_index_t , inf->pieceCount );
     int                 peerCount;
-    tr_peer**           peers;
+    const tr_peer    ** peers;
 
     assert( torrentIsLocked( t ) );
 
-    peers = getConnectedPeers( t, &peerCount );
+    peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
 
     /* make a list of the pieces that we want but don't have */
@@ -689 +670 @@
         tr_free( p );
     }
-
-    tr_free( peers );
 
     *pieceCount = poolSize;
@@ -888 +867 @@
 broadcastGotBlock( Torrent * t, uint32_t index, uint32_t offset, uint32_t length )
 {
-    int i, size;
+    size_t i;
+    size_t peerCount;
     tr_peer ** peers;
 
@@ -894 +874 @@
 
     tordbg( t, "got a block; cancelling any duplicate requests from peers %"PRIu32":%"PRIu32"->%"PRIu32, index, offset, length );
-    peers = getConnectedPeers( t, &size );
-    for( i=0; i<size; ++i )
-        tr_peerMsgsCancel( peers[i]->msgs, index, offset, length );
-    tr_free( peers );
+
+    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+    peers = (tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    for( i=0; i<peerCount; ++i )
+        if( peers[i]->msgs )
+            tr_peerMsgsCancel( peers[i]->msgs, index, offset, length );
 }
 
@@ -1122 +1104 @@
                 else
                 {
-                    int i, peerCount;
-                    tr_peer ** peers = getConnectedPeers( t, &peerCount );
-                    for( i = 0; i < peerCount; ++i )
+                    int i;
+                    int peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+                    tr_peer ** peers = (tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+                    for( i=0; i<peerCount; ++i )
                         tr_peerMsgsHave( peers[i]->msgs, p );
-                    tr_free( peers );
                 }
 
@@ -1675 +1657 @@
     int                peerCount;
     const tr_peer **   peers;
-
     managerLock( manager );
 
@@ -1709 +1690 @@
                         const uint8_t *    torrentHash )
 {
-    int           i, size;
-    Torrent *     t;
-    tr_peer **    peers;
+    int i;
+    int peerCount;
+    Torrent * t;
+    const tr_peer ** peers;
     tr_bitfield * pieces;
     managerLock( manager );
@@ -1717 +1699 @@
     t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
     pieces = tr_bitfieldNew( t->tor->info.pieceCount );
-    peers = getConnectedPeers( t, &size );
-    for( i = 0; i < size; ++i )
+    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+    peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    for( i=0; i<peerCount; ++i )
         tr_bitfieldOr( pieces, peers[i]->have );
 
     managerUnlock( manager );
-    tr_free( peers );
     return pieces;
 }
@@ -1846 +1828 @@
                      int                 * setmeCount UNUSED )
 {
-    int             i, size;
+    int i, size;
     const Torrent * t;
-    tr_peer **      peers;
-    tr_peer_stat *  ret;
+    const tr_peer ** peers;
+    tr_peer_stat * ret;
 
     assert( manager );
@@ -1855 +1837 @@
 
     t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
-    peers = getConnectedPeers( (Torrent*)t, &size );
+    size = TR_PTR_ARRAY_LENGTH( &t->peers );
+    peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
     ret = tr_new0( tr_peer_stat, size );
 
@@ -1901 +1884 @@
 
     *setmeCount = size;
-    tr_free( peers );
 
     managerUnlock( manager );
@@ -1955 +1937 @@
 rechoke( Torrent * t )
 {
-    int                i, peerCount, size, unchokedInterested;
-    tr_peer **         peers = getConnectedPeers( t, &peerCount );
+    int i, size, unchokedInterested;
+    const int peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+    tr_peer ** peers = (tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
     struct ChokeData * choke = tr_new0( struct ChokeData, peerCount );
-    const int          chokeAll = !tr_torrentIsPieceTransferAllowed( t->tor, TR_CLIENT_TO_PEER );
+    const int chokeAll = !tr_torrentIsPieceTransferAllowed( t->tor, TR_CLIENT_TO_PEER );
 
     assert( torrentIsLocked( t ) );
@@ -2047 +2030 @@
     /* cleanup */
     tr_free( choke );
-    tr_free( peers );
 }