Changeset 6961

Timestamp:

Oct 26, 2008, 3:39:04 PM (12 years ago)

Author:

charles

Message:

(libT) low-hanging fruit discovered from softwareelves' shark profile.

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• handshake.c (modified) (1 diff)
• peer-io.c (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)
• rpc-server.c (modified) (1 diff)
• session.c (modified) (1 diff)
• torrent.h (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)

trunk/libtransmission/fdlimit.c

@@ -53 +53 @@
 #include "utils.h"
 
-#define dbgmsg( ... ) tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ ); \
+    } while( 0 )
 
 /**

trunk/libtransmission/handshake.c

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

trunk/libtransmission/peer-io.c

@@ -41 +41 @@
 
 #define dbgmsg( io, ... ) \
-    tr_deepLog( __FILE__, __LINE__, tr_peerIoGetAddrStr( io ), __VA_ARGS__ )
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, tr_peerIoGetAddrStr( io ), __VA_ARGS__ ); \
+    } while( 0 )
 
 struct tr_bandwidth

trunk/libtransmission/peer-mgr.c

@@ -133 +133 @@
 
 #define tordbg( t, ... ) \
-    tr_deepLog( __FILE__, __LINE__, t->tor->info.name, __VA_ARGS__ )
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, t->tor->info.name, __VA_ARGS__ ); \
+    } while( 0 )
 
 #define dbgmsg( ... ) \
-    tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ )
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, NULL, __VA_ARGS__ ); \
+    } while( 0 )
 
 /**
@@ -864 +870 @@
 
         assert( tr_torrentReqIsValid( tor, index, offset, length ) );
-        assert( _tr_block( tor, index, offset ) == block );
         assert( offset < tr_torPieceCountBytes( tor, index ) );
         assert( (offset + length) <= tr_torPieceCountBytes( tor, index ) );

trunk/libtransmission/rpc-server.c

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

trunk/libtransmission/session.c

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

trunk/libtransmission/torrent.h

@@ -121 +121 @@
                                  uint32_t           length );
 
-void             tr_torrentInitFilePriority( tr_torrent *    tor,
-                                             tr_file_index_t fileIndex,
-                                             tr_priority_t   priority );
+void             tr_torrentInitFilePriority( tr_torrent       * tor,
+                                             tr_file_index_t    fileIndex,
+                                             tr_priority_t      priority );
 
 
 int              tr_torrentCountUncheckedPieces( const tr_torrent * );
 
-int              tr_torrentIsPieceChecked( const            tr_torrent *,
-                                           tr_piece_index_t piece );
-
-int              tr_torrentIsFileChecked( const           tr_torrent *,
-                                          tr_file_index_t file );
-
-void             tr_torrentSetPieceChecked(
-                     tr_torrent *,
-    tr_piece_index_t piece,
-    int              isChecked );
-
-void             tr_torrentSetFileChecked(
-    tr_torrent *,
-    tr_file_index_t
-    file,
-    int
-    isChecked );
-
-void             tr_torrentUncheck( tr_torrent * );
-
-int              tr_torrentPromoteTracker(                 tr_torrent *,
-                                                       int trackerIndex );
-
-time_t*          tr_torrentGetMTimes( const    tr_torrent *,
-                                      size_t * setmeCount );
+int              tr_torrentIsPieceChecked( const tr_torrent  * tor,
+                                           tr_piece_index_t    piece );
+
+int              tr_torrentIsFileChecked( const tr_torrent  * tor,
+                                          tr_file_index_t     file );
+
+void             tr_torrentSetPieceChecked( tr_torrent       * tor,
+                                            tr_piece_index_t   piece,
+                                            int                isChecked );
+
+void             tr_torrentSetFileChecked( tr_torrent       * tor,
+                                           tr_file_index_t    file,
+                                           int                isChecked );
+
+void             tr_torrentUncheck( tr_torrent * tor );
+
+int              tr_torrentPromoteTracker( tr_torrent   * tor,
+                                           int            trackerIndex );
+
+time_t*          tr_torrentGetMTimes( const tr_torrent  * tor,
+                                      size_t            * setmeCount );
 
 typedef enum

trunk/libtransmission/tracker.c

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

trunk/libtransmission/trevent.c

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

trunk/libtransmission/utils.c

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

trunk/libtransmission/utils.h

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

trunk/libtransmission/web.c

@@ -30 +30 @@
 #define DEFAULT_TIMER_MSEC 2000
 
-#define dbgmsg( ... )  tr_deepLog( __FILE__, __LINE__, "web", __VA_ARGS__ )
+#define dbgmsg( ... ) \
+    do { \
+        if( tr_deepLoggingIsActive( ) ) \
+            tr_deepLog( __FILE__, __LINE__, "web", __VA_ARGS__ ); \
+    } while( 0 )
 /* #define dbgmsg(...) \
  do { fprintf( stderr, __VA_ARGS__ ); fprintf( stderr, "\n" ); } while( 0 ) */