Changeset 3117

Timestamp:

Sep 20, 2007, 11:33:46 PM (15 years ago)

Author:

charles

Message:

clamp down on the flood of debug messages.

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (2 diffs)
• tracker.c (modified) (5 diffs)
• transmission.c (modified) (5 diffs)
• trevent.c (modified) (1 diff)
• utils.c (modified) (4 diffs)
• utils.h (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -139 +139 @@
 myDebug( const char * file, int line, const tr_handshake * handshake, const char * fmt, ... )
 {
-    va_list args;
-    const char * addr = tr_peerIoGetAddrStr( handshake->io );
-    struct evbuffer * buf = evbuffer_new( );
-    evbuffer_add_printf( buf, "[%s:%d] %s (%p) ", file, line, addr, handshake );
-    va_start( args, fmt );
-    evbuffer_add_vprintf( buf, fmt, args );
-    va_end( args );
-
-    fprintf( stderr, "%s\n", EVBUFFER_DATA(buf) );
-
-    evbuffer_free( buf );
+    FILE * fp = tr_getLog( );
+    if( fp != NULL )
+    {
+        va_list args;
+        const char * addr = tr_peerIoGetAddrStr( handshake->io );
+        struct evbuffer * buf = evbuffer_new( );
+        evbuffer_add_printf( buf, "[%s:%d] %s (%p) ", file, line, addr, handshake );
+        va_start( args, fmt );
+        evbuffer_add_vprintf( buf, fmt, args );
+        va_end( args );
+        fprintf( stderr, "%s\n", EVBUFFER_DATA(buf) );
+        evbuffer_free( buf );
+    }
 }
 

trunk/libtransmission/peer-mgr.c

@@ -183 +183 @@
     if( peer->msgs != NULL )
     {
-fprintf( stderr, "PUB unsub peer %p from msgs %p\n", peer, peer->msgs );
         tr_peerMsgsUnsubscribe( peer->msgs, peer->msgsTag );
         tr_peerMsgsFree( peer->msgs );
@@ -635 +634 @@
             peer->client = peer_id ? tr_clientForId( peer_id ) : NULL;
             peer->peerSupportsEncryption = peerSupportsEncryption ? 1 : 0;
-            fprintf( stderr, "PUB sub peer %p to msgs %p\n", peer, peer->msgs );
             peer->msgsTag = tr_peerMsgsSubscribe( peer->msgs, msgsCallbackFunc, t );
         }

trunk/libtransmission/peer-msgs.c

@@ -136 +136 @@
 myDebug( const char * file, int line, const struct tr_peermsgs * msgs, const char * fmt, ... )
 {
-    va_list args;
-    const char * addr = tr_peerIoGetAddrStr( msgs->io );
-    struct evbuffer * buf = evbuffer_new( );
-    evbuffer_add_printf( buf, "[%s:%d] %s (%p) ", file, line, addr, msgs );
-    va_start( args, fmt );
-    evbuffer_add_vprintf( buf, fmt, args );
-    va_end( args );
-
-    fprintf( stderr, "%s\n", EVBUFFER_DATA(buf) );
-
-    evbuffer_free( buf );
+    FILE * fp = tr_getLog( );
+    if( fp != NULL )
+    {
+        va_list args;
+        const char * addr = tr_peerIoGetAddrStr( msgs->io );
+        struct evbuffer * buf = evbuffer_new( );
+        evbuffer_add_printf( buf, "[%s:%d] %s (%p) ", file, line, addr, msgs );
+        va_start( args, fmt );
+        evbuffer_add_vprintf( buf, fmt, args );
+        va_end( args );
+        fprintf( fp, "%s\n", EVBUFFER_DATA(buf) );
+        evbuffer_free( buf );
+    }
 }
 
@@ -449 +451 @@
     tr_bencInitStr( tr_bencDictAdd( &val, "v" ), v, 0, 1 );
     buf = tr_bencSaveMalloc( &val,  &len );
-    tr_bencPrint( &val );
 
     msglen = sizeof(tr_msgid) + sizeof(ltep_msgid) + len;

trunk/libtransmission/tracker.c

@@ -266 +266 @@
 }
 
-static int trackerCount = 0;
-static int torrentCount = 0;
-
 static Tracker*
 tr_trackerGet( const tr_torrent * tor )
@@ -289 +286 @@
 
         t = tr_new0( Tracker, 1 );
-fprintf( stderr, "TRACKER new tracker %p addr %s; counts are trackers %d torrents %d\n", t, info->primaryAddress, ++trackerCount, torrentCount );
         t->handle = tor->handle;
         t->primaryAddress = tr_strdup( info->primaryAddress );
@@ -364 +360 @@
     tr_ptrArrayRemoveSorted( t->scraping, tor, torrentCompare );
 
-fprintf( stderr, "TRACKER freeing torrent %p name %s; counts are trackers %d torrents %d\n", tor, tor->torrent->info.name, trackerCount, --torrentCount );
     tr_timerFree( &tor->scrapeTimer );
     tr_timerFree( &tor->reannounceTimer );
@@ -379 +374 @@
         tr_ptrArrayRemoveSorted( getTrackerLookupTable( ), t, trackerCompare );
 
-fprintf( stderr, "TRACKER freeing tracker %p; counts are trackers %d torrents %d\n", t, --trackerCount, torrentCount );
-
         if( t->connection != NULL )
             evhttp_connection_free( t->connection );
@@ -420 +413 @@
     /* create a new Torrent and queue it for scraping */
     tor = tr_new0( Torrent, 1 );
-fprintf( stderr, "TRACKER new torrent %p name %s; counts are trackers %d torrents %d\n", tor, torrent->info.name, trackerCount, ++torrentCount );
     tor->publisher = tr_publisherNew( );
     tor->tracker = t;

trunk/libtransmission/transmission.c

@@ -235 +235 @@
 }
 
-
-void tr_torrentRates( tr_handle * h, float * dl, float * ul )
+void
+tr_torrentRates( tr_handle * h, float * dl, float * ul )
 {
     tr_torrent * tor;
@@ -254 +254 @@
 }
 
-int tr_torrentCount( tr_handle * h )
+int
+tr_torrentCount( tr_handle * h )
 {
     return h->torrentCount;
 }
 
-void tr_torrentIterate( tr_handle * h, tr_callback_t func, void * d )
+void
+tr_torrentIterate( tr_handle * h, tr_callback_t func, void * d )
 {
     tr_torrent * tor, * next;
@@ -274 +276 @@
 {
     tr_handle * h = vh;
-fprintf( stderr, "in tr_closeImpl\n" );
     tr_peerMgrFree( h->peerMgr );
-fprintf( stderr, "calling mgr free\n" );
 
     tr_rcClose( h->upload );
     tr_rcClose( h->download );
 
-fprintf( stderr, "calling shared close\n" );
     tr_sharedClose( h->shared );
-fprintf( stderr, "calling fd close\n" );
     tr_fdClose();
 
-fprintf( stderr, "setting h->closed to TRUE\n" );
     h->isClosed = TRUE;
 }
@@ -292 +289 @@
 tr_close( tr_handle * h )
 {
-    fprintf( stderr, "torrentCount is %d\n", h->torrentCount );
     assert( tr_torrentCount( h ) == 0 );
 
-fprintf( stderr, "here I am in tr_close...\n" );
     tr_runInEventThread( h, tr_closeImpl, h );
     while( !h->isClosed )
@@ -308 +303 @@
     free( h->tag );
     free( h );
+    fprintf( stderr, "tr_close() completed.\n" );
 }
 

trunk/libtransmission/trevent.c

@@ -212 +212 @@
 
     event_dispatch( );
-fprintf( stderr, "w00t!!!!!!!!!!!!!!!!!!!\n" );
 
     tr_lockFree( eh->lock );

trunk/libtransmission/utils.c

@@ -62 +62 @@
 }
 
-void tr_setMessageLevel( int level )
+FILE*
+tr_getLog( void )
+{
+    static int initialized = FALSE;
+    static FILE * file= NULL;
+
+    if( !initialized )
+    {
+        const char * str = getenv( "TR_DEBUG_FD" );
+        int fd;
+        if( str && *str )
+            fd = atoi( str );
+        switch( fd ) {
+            case 1: file = stdout; break;
+            case 2: file = stderr; break;
+            default: file = NULL; break;
+        }
+        initialized = TRUE;
+    }
+
+    return file;
+}
+
+void
+tr_setMessageLevel( int level )
 {
     tr_msgInit();
@@ -121 +145 @@
     va_list       args1, args2;
     tr_msg_list * newmsg;
-    int             len1, len2;
+    int           len1, len2;
+    FILE        * fp;
 
     assert( NULL != messageLock );
     tr_lockLock( messageLock );
+
+    fp = tr_getLog( );
 
     if( !messageLevel )
@@ -149 +176 @@
                              args1, args2 );
                 va_end( args2 );
+                if( fp != NULL )
+                    fprintf( fp, "%s\n", newmsg->message );
                 if( NULL == newmsg->message )
                 {
@@ -162 +191 @@
         else
         {
-            vfprintf( stderr, msg, args1 );
-            fputc( '\n', stderr );
-            fflush( stderr );
+            if( fp == NULL )
+                fp = stderr;
+            vfprintf( fp, msg, args1 );
+            fputc( '\n', fp );
+            fflush( fp );
         }
         va_end( args1 );

trunk/libtransmission/utils.h

@@ -29 +29 @@
 #include <stdarg.h>
 #include <stddef.h> /* for size_t */
+#include <stdio.h> /* FILE* */
 
 void tr_msgInit( void );
@@ -36 +37 @@
 #define tr_dbg( a... ) tr_msg( TR_MSG_DBG, ## a )
 void tr_msg  ( int level, char * msg, ... );
+FILE* tr_getLog( void );
 
 int  tr_rand ( int );