Changeset 9611

Timestamp:

Nov 28, 2009, 7:15:31 AM (12 years ago)

Author:

charles

Message:

(trunk libT) performance improvements to peer-mgr.c's peerIsInUse()

File:

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

trunk/libtransmission/peer-mgr.c

@@ -115 +115 @@
 struct peer_atom
 {
+    tr_peer   * peer;        /* will be NULL if not connected */
     uint8_t     from;
     uint8_t     flags;       /* these match the added_f flags */
@@ -310 +311 @@
 }
 
-static int
-peerCompareToAddr( const void * a, const void * vb )
-{
-    return tr_compareAddresses( tr_peerAddress( a ), vb );
-}
-
-static tr_peer*
-getExistingPeer( Torrent          * torrent,
-                 const tr_address * addr )
-{
-    assert( torrentIsLocked( torrent ) );
-    assert( addr );
-
-    return tr_ptrArrayFindSorted( &torrent->peers, addr, peerCompareToAddr );
-}
-
 static struct peer_atom*
 getExistingAtom( const Torrent    * t,
@@ -336 +321 @@
 
 static tr_bool
-peerIsInUse( const Torrent    * ct,
-             const tr_address * addr )
+peerIsInUse( const Torrent * ct, const struct peer_atom * atom )
 {
     Torrent * t = (Torrent*) ct;
@@ -343 +327 @@
     assert( torrentIsLocked ( t ) );
 
-    return getExistingPeer( t, addr )
-        || getExistingHandshake( &t->outgoingHandshakes, addr )
-        || getExistingHandshake( &t->manager->incomingHandshakes, addr );
+    return ( atom->peer != NULL )
+        || getExistingHandshake( &t->outgoingHandshakes, &atom->addr )
+        || getExistingHandshake( &t->manager->incomingHandshakes, &atom->addr );
 }
 
@@ -354 +338 @@
     tr_bitsetConstructor( &peer->have, 0 );
     peer->atom = atom;
+    atom->peer = peer;
+    peer->atom = atom;
     return peer;
 }
@@ -364 +350 @@
     assert( torrentIsLocked( torrent ) );
 
-    peer = getExistingPeer( torrent, &atom->addr );
+    peer = atom->peer;
 
     if( peer == NULL )
@@ -396 +382 @@
     tr_bitfieldFree( peer->blame );
     tr_free( peer->client );
+    peer->atom->peer = NULL;
 
     tr_free( peer );
@@ -1518 +1505 @@
         else
         {
-            tr_peer * peer = getExistingPeer( t, addr );
+            tr_peer * peer = atom->peer;
 
             if( peer ) /* we already have this peer */
@@ -2539 +2526 @@
 
         /* we don't need two connections to the same peer... */
-        if( peerIsInUse( t, &atom->addr ) )
+        if( peerIsInUse( t, atom ) )
             continue;
 
@@ -3026 +3013 @@
             for( i=0; i<atomCount; ++i ) {
                 struct peer_atom * atom = atoms[i];
-                if( peerIsInUse( t, &atom->addr ) )
+                if( peerIsInUse( t, atom ) )
                     keep[keepCount++] = atom;
                 else