Changeset 7288

Timestamp:

Dec 5, 2008, 6:00:53 PM (13 years ago)

Author:

charles

Message:

(1.3x libT) backport #1387: Easy code changes to reduce CPU load

Location:

branches/1.3x/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• handshake.c (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)
• peer-msgs.c (modified) (9 diffs)
• rpc-server.c (modified) (1 diff)
• session.c (modified) (1 diff)
• tracker.c (modified) (1 diff)
• trevent.c (modified) (1 diff)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)
• web.c (modified) (1 diff)

branches/1.3x/libtransmission/fdlimit.c

@@ -60 +60 @@
 #endif
 
-#define dbgmsg(fmt...) tr_deepLog( __FILE__, __LINE__, NULL, ##fmt )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ ); \
+    } while( 0 )
 
 /**

branches/1.3x/libtransmission/handshake.c

@@ -135 +135 @@
 **/
 
-#define dbgmsg(handshake, fmt...) tr_deepLog( __FILE__, __LINE__, tr_peerIoGetAddrStr( handshake->io ), ##fmt )
+#define dbgmsg( handshake, ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, tr_peerIoGetAddrStr( handshake->io ), __VA_ARGS__ ); \
+    } while( 0 )
 
 static const char* getStateName( short state )

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

@@ -128 +128 @@
 };
 
-#define tordbg(t, fmt...) tr_deepLog( __FILE__, __LINE__, t->tor->info.name, ##fmt )
+#define tordbg( t, ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, t->tor->info.name, __VA_ARGS__ ); \
+    } while( 0 )
 
 /**

branches/1.3x/libtransmission/peer-msgs.c

@@ -588 +588 @@
 tr_peerMsgsSetChoke( tr_peermsgs * msgs, 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 );
@@ -604 +605 @@
             cancelAllRequestsToClientExceptFast( msgs );
         protocolSendChoke( msgs, choke );
-        msgs->info->chokeChangedAt = time( NULL );
+        msgs->info->chokeChangedAt = now;
     }
 }
@@ -780 +781 @@
 
 static void
-expireOldRequests( tr_peermsgs * msgs )
+expireOldRequests( tr_peermsgs * msgs, const time_t now )
 {
     int i;
@@ -787 +788 @@
 
     /* 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 ) {
@@ -797 +798 @@
 
     /* 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 ) {
@@ -808 +809 @@
 
 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;
@@ -1448 +1448 @@
 
 static void
-peerGotBytes( tr_peermsgs * msgs, uint32_t byteCount )
-{
-    msgs->info->pieceDataActivityDate = time( NULL );
+peerGotBytes( tr_peermsgs * msgs, uint32_t byteCount, const time_t now )
+{
+    msgs->info->pieceDataActivityDate = now;
     tr_rcTransferred( msgs->info->rcToPeer, byteCount );
     firePeerGotData( msgs, byteCount );
@@ -1660 +1660 @@
 
     tr_peerIoTryRead( msgs->io );
-    pumpRequestQueue( msgs );
-    expireOldRequests( msgs );
+    pumpRequestQueue( msgs, now );
+    expireOldRequests( msgs, now );
 
     if( msgs->sendingBlock )
@@ -1675 +1675 @@
             tr_peerIoWrite( msgs->io, EVBUFFER_DATA( msgs->outBlock ), outlen );
             evbuffer_drain( msgs->outBlock, outlen );
-            peerGotBytes( msgs, outlen );
+            peerGotBytes( msgs, outlen, now );
 
             len -= outlen;

branches/1.3x/libtransmission/rpc-server.c

@@ -51 +51 @@
 };
 
-#define dbgmsg(fmt...) tr_deepLog(__FILE__, __LINE__, MY_NAME, ##fmt )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, MY_NAME, __VA_ARGS__ ); \
+    } while( 0 )
 
 static const char*

branches/1.3x/libtransmission/session.c

@@ -534 +534 @@
 #define SHUTDOWN_MAX_SECONDS 30
 
-#define dbgmsg(fmt...) tr_deepLog( __FILE__, __LINE__, NULL, ##fmt )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ ); \
+    } while( 0 )
 
 void

branches/1.3x/libtransmission/tracker.c

@@ -116 +116 @@
 };
 
-#define dbgmsg(name, fmt...) tr_deepLog(__FILE__, __LINE__, name, ##fmt )
+#define dbgmsg( name, ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, name, __VA_ARGS__ ); \
+    } while( 0 )
 
 /***

branches/1.3x/libtransmission/trevent.c

@@ -67 +67 @@
 };
 
-#define dbgmsg(fmt...) tr_deepLog( __FILE__, __LINE__, "event", ##fmt )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, "event", __VA_ARGS__ ); \
+    } while( 0 )
 
 static void

branches/1.3x/libtransmission/utils.c

@@ -173 +173 @@
 }
 
+int
+tr_deepLoggingIsActive( void )
+{
+    return tr_getLog != NULL;
+}
+
 void
 tr_deepLog( const char * file, int line, const char * name, const char * fmt, ... )

branches/1.3x/libtransmission/utils.h

@@ -111 +111 @@
 
 FILE* tr_getLog( void );
+
+int  tr_deepLoggingIsActive( void );
 
 void tr_deepLog( const char * file, int line,

branches/1.3x/libtransmission/web.c

@@ -30 +30 @@
 #define PULSE_MSEC 500
 
-#define dbgmsg(fmt...) tr_deepLog( __FILE__, __LINE__, "web", ##fmt )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, "web", __VA_ARGS__ ); \
+    } while( 0 )
 
 struct tr_web