Changeset 9872 for branches

Timestamp:

Jan 4, 2010, 10:21:58 PM (13 years ago)

Author:

charles

Message:

(1.7x libT) backport to 1.7x branch: r9529 #2589 "unnecessary calls to time() cause high CPU load"

File:

• branches/1.7x/libtransmission/peer-mgr.c (modified) (4 diffs)

branches/1.7x/libtransmission/peer-mgr.c

@@ -2108 +2108 @@
 shouldPeerBeClosed( const Torrent    * t,
                     const tr_peer    * peer,
-                    int                peerCount )
+                    int                peerCount,
+                    const time_t       now )
 {
     const tr_torrent *       tor = t->tor;
-    const time_t             now = time( NULL );
     const struct peer_atom * atom = peer->atom;
 
@@ -2176 +2176 @@
     tr_peer ** peers = (tr_peer**) tr_ptrArrayPeek( &t->peers, &peerCount );
     struct tr_peer ** ret = tr_new( tr_peer *, peerCount );
+    const time_t now = time( NULL );
 
     assert( torrentIsLocked( t ) );
 
     for( i = outsize = 0; i < peerCount; ++i )
-        if( shouldPeerBeClosed( t, peers[i], peerCount ) == closeType )
+        if( shouldPeerBeClosed( t, peers[i], peerCount, now ) == closeType )
             ret[outsize++] = peers[i];
 
@@ -2218 +2219 @@
 
 static int
-getReconnectIntervalSecs( const struct peer_atom * atom )
-{
-    int          sec;
-    const time_t now = time( NULL );
+getReconnectIntervalSecs( const struct peer_atom * atom, const time_t now )
+{
+    int sec;
 
     /* if we were recently connected to this peer and transferring piece
@@ -2287 +2287 @@
 
         /* don't reconnect too often */
-        interval = getReconnectIntervalSecs( atom );
+        interval = getReconnectIntervalSecs( atom, now );
         if( ( now - atom->time ) < interval )
         {