Changeset 7589

Timestamp:

Jan 2, 2009, 11:48:51 PM (12 years ago)

Author:

charles

Message:

(trunk libT) avoid unnecessary duplicate calls to tr_date() in tr_bandwidthUsed()

File:

• trunk/libtransmission/bandwidth.c (modified) (3 diffs)

trunk/libtransmission/bandwidth.c

@@ -55 +55 @@
 
 static void
-bytesUsed( struct bratecontrol * r, size_t size )
-{
-    const uint64_t now = tr_date ( );
-
+bytesUsed( const uint64_t now, struct bratecontrol * r, size_t size )
+{
     if( r->transfers[r->newest].date + GRANULARITY_MSEC >= now )
         r->transfers[r->newest].size += size;
@@ -303 +301 @@
 }
 
+static void
+bandwidthUsedImpl( tr_bandwidth  * b,
+                   tr_direction    dir,
+                   size_t          byteCount,
+                   tr_bool         isPieceData,
+                   uint64_t        now )
+{
+    struct tr_band * band;
+    size_t oldBytesLeft;
+
+    assert( tr_isBandwidth( b ) );
+    assert( tr_isDirection( dir ) );
+
+    band = &b->band[dir];
+
+    oldBytesLeft = band->bytesLeft;
+
+    if( band->isLimited && isPieceData )
+        band->bytesLeft -= MIN( band->bytesLeft, byteCount );
+
+#ifdef DEBUG_DIRECTION
+if( ( dir == DEBUG_DIRECTION ) && ( band->isLimited ) )
+fprintf( stderr, "%p consumed %5zu bytes of %5s data... was %6zu, now %6zu left\n",
+         b, byteCount, (isPieceData?"piece":"raw"), oldBytesLeft, band->bytesLeft );
+#endif
+
+    bytesUsed( now, &band->raw, byteCount );
+
+    if( isPieceData )
+        bytesUsed( now, &band->piece, byteCount );
+
+    if( b->parent != NULL )
+        bandwidthUsedImpl( b->parent, dir, byteCount, isPieceData, now );
+}
+
 void
 tr_bandwidthUsed( tr_bandwidth  * b,
@@ -309 +342 @@
                   tr_bool         isPieceData )
 {
-    struct tr_band * band;
-    size_t oldBytesLeft;
-
-    assert( tr_isBandwidth( b ) );
-    assert( tr_isDirection( dir ) );
-
-    band = &b->band[dir];
-
-    oldBytesLeft = band->bytesLeft;
-
-    if( band->isLimited && isPieceData )
-        band->bytesLeft -= MIN( band->bytesLeft, byteCount );
-
-#ifdef DEBUG_DIRECTION
-if( ( dir == DEBUG_DIRECTION ) && ( band->isLimited ) )
-fprintf( stderr, "%p consumed %5zu bytes of %5s data... was %6zu, now %6zu left\n",
-         b, byteCount, (isPieceData?"piece":"raw"), oldBytesLeft, band->bytesLeft );
-#endif
-
-    bytesUsed( &band->raw, byteCount );
-
-    if( isPieceData )
-        bytesUsed( &band->piece, byteCount );
-
-    if( b->parent != NULL )
-        tr_bandwidthUsed( b->parent, dir, byteCount, isPieceData );
-}
+    bandwidthUsedImpl( b, dir, byteCount, isPieceData, tr_date( ) );
+}