Changeset 6964

Timestamp:

Oct 27, 2008, 4:12:42 AM (12 years ago)

Author:

charles

Message:

(libT) eliminate some duplicate calls to time(NULL) that showed a spike on vraa & softwareelves' shark profiles

File:

• trunk/libtransmission/peer-msgs.c (modified) (11 diffs)

trunk/libtransmission/peer-msgs.c

@@ -598 +598 @@
                      int           choke )
 {
-    const time_t fibrillationTime = time( NULL ) - MIN_CHOKE_PERIOD_SEC;
+    const time_t now = time( NULL );
+    const time_t fibrillationTime = now - MIN_CHOKE_PERIOD_SEC;
 
     assert( msgs );
@@ -615 +616 @@
             cancelAllRequestsToClientExceptFast( msgs );
         protocolSendChoke( msgs, choke );
-        msgs->info->chokeChangedAt = time( NULL );
+        msgs->info->chokeChangedAt = now;
     }
 }
@@ -768 +769 @@
 
 static void
-expireOldRequests( tr_peermsgs * msgs )
+expireOldRequests( tr_peermsgs * msgs, const time_t now  )
 {
     int                 i;
@@ -775 +776 @@
 
     /* cancel requests that have been queued for too long */
-    oldestAllowed = time( NULL ) - QUEUED_REQUEST_TTL_SECS;
+    oldestAllowed = now - QUEUED_REQUEST_TTL_SECS;
     reqListCopy( &tmp, &msgs->clientWillAskFor );
     for( i = 0; i < tmp.count; ++i )
@@ -786 +787 @@
 
     /* cancel requests that were sent too long ago */
-    oldestAllowed = time( NULL ) - SENT_REQUEST_TTL_SECS;
+    oldestAllowed = now - SENT_REQUEST_TTL_SECS;
     reqListCopy( &tmp, &msgs->clientAskedFor );
     for( i = 0; i < tmp.count; ++i )
@@ -798 +799 @@
 
 static void
-pumpRequestQueue( tr_peermsgs * msgs )
+pumpRequestQueue( tr_peermsgs * msgs, const time_t now )
 {
     const int           max = msgs->maxActiveRequests;
     const int           min = msgs->minActiveRequests;
-    const time_t        now = time( NULL );
     int                 sent = 0;
     int                 count = msgs->clientAskedFor.count;
@@ -1536 +1536 @@
 static void
 peerGotBytes( tr_peermsgs * msgs,
-              uint32_t      byteCount )
-{
-    msgs->info->pieceDataActivityDate = time( NULL );
+              uint32_t      byteCount,
+              const time_t  now )
+{
+    msgs->info->pieceDataActivityDate = now;
     firePeerGotData( msgs, byteCount );
 }
@@ -1707 +1708 @@
 
     /*tr_peerIoTryRead( msgs->io );*/
-    pumpRequestQueue( msgs );
-    expireOldRequests( msgs );
+    pumpRequestQueue( msgs, now );
+    expireOldRequests( msgs, now );
 
     if( msgs->sendingBlock )
@@ -1720 +1721 @@
         if( outlen )
         {
-            tr_peerIoWrite( msgs->io, EVBUFFER_DATA(
-                                msgs->outBlock ), outlen );
+            tr_peerIoWrite( msgs->io, EVBUFFER_DATA( msgs->outBlock ), outlen );
             evbuffer_drain( msgs->outBlock, outlen );
-            peerGotBytes( msgs, outlen );
+            peerGotBytes( msgs, outlen, now );
 
             len -= outlen;
@@ -1734 +1734 @@
         else dbgmsg( msgs,
                      "stalled writing block... uploadMax %lu, outlen %lu",
-                     uploadMax,
-                     outlen );
+                     uploadMax, outlen );
     }
 
@@ -1741 +1740 @@
     {
         struct peer_request req;
-        int                 haveMessages = EVBUFFER_LENGTH(
-            msgs->outMessages ) != 0;
+        const int haveMessages = EVBUFFER_LENGTH( msgs->outMessages ) != 0;
 
         if( haveMessages && !msgs->outMessagesBatchedAt ) /* fresh batch */