Changeset 2876

Timestamp:

Aug 20, 2007, 2:29:36 AM (16 years ago)

Author:

charles

Message:

minor improvements to.. you guessed it.. the tracker/libevent code

Location:

trunk/libtransmission

Files:

• inout.c (modified) (1 diff)
• tracker.c (modified) (21 diffs)
• trevent.c (modified) (1 diff)
• trevent.h (modified) (1 diff)

trunk/libtransmission/inout.c

@@ -309 +309 @@
     if( success )
     {
-        tr_inf( "Piece %d hash OK", pieceIndex );
+        tr_dbg( "Piece %d hash OK", pieceIndex );
         tr_cpPieceAdd( tor->completion, pieceIndex );
     }

trunk/libtransmission/tracker.c

@@ -51 +51 @@
 #define REQ_TIMEOUT_INTERVAL_SEC 60
 
-/* the number of peers that is our goal */
+/* the value of the 'numwant' argument passed in tracker requests */
 #define NUMWANT 75
 
@@ -184 +184 @@
     static tr_ptrArray_t * connections = NULL;
     if( !connections )
-        connections = tr_ptrArrayNew( );
+         connections = tr_ptrArrayNew( );
 
     tmp.address = (char*) address;
@@ -236 +236 @@
     event.peerCount = count;
     event.peerCompact = peers;
-    tr_inf( "torrent %s got %d new peers", tor->torrent->info.name, count );
+    tr_inf( "Torrent \"%s\" got %d new peers", tor->torrent->info.name, count );
     tr_publisherPublish( tor->publisher, tor, &event );
 }
@@ -282 +282 @@
 
     if( !t->scrapeTag )
-         t->scrapeTag = tr_timerNew( t->handle, onTrackerScrapeNow, t, NULL, 1000 );
+         t->scrapeTag = tr_timerNew( t->handle,
+                                     onTrackerScrapeNow, t,
+                                     NULL, 1000 );
 }
 
@@ -358 +360 @@
 
 static void
-escape( char * out, const uint8_t * in, int in_len )
+escape( char * out, const uint8_t * in, int in_len ) /* rfc2396 */
 {
     const uint8_t *end = in + in_len;
@@ -570 +572 @@
     Tracker * t = (Tracker*) vt;
 
-    tr_inf( "scrape response from  '%s': %s",
+    tr_inf( "Got scrape response from  '%s': %s",
             t->primaryAddress,
             (req ? req->response_code_line : "(null)") );
@@ -578 +580 @@
         int numResponses = 0;
         benc_val_t benc, *files;
-        int n_scraping = tr_ptrArraySize( t->scraping );
+        const int n_scraping = tr_ptrArraySize( t->scraping );
         const int bencLoaded = !parseBencResponse( req, &benc );
 
@@ -621 +623 @@
                                               tor, NULL,
                                               t->scrapeIntervalMsec );
-                tr_dbg( "torrent '%s' scraped.  re-scraping in %d seconds",
+                tr_dbg( "Torrent '%s' scrape successful."
+                        "  Rescraping in %d seconds",
                         tor->torrent->info.name, t->scrapeIntervalMsec/1000 );
             }
@@ -638 +641 @@
                     tr_trackerStop( torrents[i] );
                 tr_ptrArrayClear( t->scraping );
-                n_scraping = 0;
 
                 t->multiscrapeMax = INT_MAX;
@@ -652 +654 @@
         if( ( 0 < numResponses ) && ( numResponses < n_scraping ) )
             t->multiscrapeMax = numResponses;
-    }
-    else if( !req )
-    {
-        int i, n;
-        Torrent ** torrents = (Torrent**)
-            tr_ptrArrayPeek( t->scraping, &n );
-        for( i=0; i<n; ++i )
-            torrents[i]->scrapeTag = tr_timerNew( t->handle,
-                                                  onTorrentScrapeNow,
-                                                  torrents[i], NULL,
-                                                  t->scrapeIntervalMsec );
-        tr_ptrArrayClear( t->scraping );
-
-        t->multiscrapeMax = INT_MAX;
     }
 
@@ -732 +720 @@
         tr_ptrArrayErase( t->scrapeQueue, 0, ask_n );
 
-        /* don't scrape again until we have some response from the tracker */
-        tr_timerFree( &t->scrapeTag );
-
         /* ping the tracker */
-        tr_inf( "scrape to %s:%d: %s", address->address, address->port, uri );
+        tr_inf( "Sending scrape to tracker %s:%d: %s",
+                address->address, address->port, uri );
         evcon = getConnection( address->address, address->port );
-        assert( evcon != NULL );
         evhttp_connection_set_timeout( evcon, SCRAPE_TIMEOUT_INTERVAL_SEC );
         req = evhttp_request_new( onScrapeResponse, t );
@@ -746 +731 @@
     }
 
+    t->scrapeTag = NULL;
     return FALSE;
 }
@@ -756 +742 @@
 
 static int
-torrentIsRunning( Torrent * tor )
-{
-    return tor->lastRequest && strcmp( tor->lastRequest, "stopped" );
+torrentIsRunning( const Torrent * tor )
+{
+    return ( tor != NULL )
+        && ( tor->lastRequest != NULL )
+        && ( strcmp( tor->lastRequest, "stopped" ) );
 }
 
@@ -835 +823 @@
 }
 
-static int
-onReannounceNow( void * vtor );
-
 /* handle braindead trackers whose minimums is higher
    than the interval. */
@@ -856 +841 @@
         t->announceIntervalMsec = t->minAnnounceIntervalMsec;
 }
+
+static int onReannounceNow( void * vtor );
 
 static void
@@ -865 +852 @@
     int reannounceInterval;
 
-    tr_inf( "torrent \"%s\" tracker response: %s",
+    tr_inf( "Torrent \"%s\" tracker response: %s",
             tor->torrent->info.name,
             ( req ? req->response_code_line : "(null)") );
@@ -971 +958 @@
     struct evhttp_connection * evcon = NULL;
 
-    tr_inf( "tracker request to %s:%d: %s", address->address,
-                                            address->port, uri );
+    tr_inf( "Torrent \"%s\" sending '%s' to tracker %s:%d: %s",
+            tor->torrent->info.name,
+            (eventName ? eventName : "periodic announce"),
+            address->address, address->port,
+            uri );
 
     /* kill any pending requests */
@@ -987 +977 @@
         tor->httpReq = evhttp_request_new( onTrackerResponse, tor );
         addCommonHeaders( tor->tracker, tor->httpReq );
-        tr_evhttp_make_request( tor->tracker->handle, evcon, tor->httpReq, EVHTTP_REQ_GET, uri );
+        tr_evhttp_make_request( tor->tracker->handle, evcon,
+                                tor->httpReq, EVHTTP_REQ_GET, uri );
     }
 
@@ -996 +987 @@
 onReannounceNow( void * vtor )
 {
-    sendTrackerRequest( (Torrent*)vtor, "" );
+    Torrent * tor = (Torrent *) vtor;
+    sendTrackerRequest( tor, "" );
+    tor->reannounceTag = NULL;
     return FALSE;
 }
@@ -1030 +1023 @@
     /* return true if this torrent's currently running
        and it's been long enough since the last announce */
-    return ( tor != NULL )
-        && ( tor->reannounceTag != NULL )
+    return ( torrentIsRunning( tor ) )
         && ( tr_date() >= tor->manualAnnounceAllowedAt );
 }
@@ -1041 +1033 @@
                      int                 * setme_seederCount )
 {
-    if( setme_completedCount)
+    if( setme_completedCount )
        *setme_completedCount = tor->timesDownloaded;
 
-    if( setme_leecherCount)
+    if( setme_leecherCount )
        *setme_leecherCount = tor->leechers;
 
-    if( setme_seederCount)
+    if( setme_seederCount )
        *setme_seederCount = tor->seeders;
 }

trunk/libtransmission/trevent.c

@@ -34 +34 @@
 #include "utils.h"
 
-//#define DEBUG
+/* #define DEBUG */
 #ifdef DEBUG
 #undef tr_dbg

trunk/libtransmission/trevent.h

@@ -16 +16 @@
 **/
 
-extern void tr_eventInit( struct tr_handle_s * tr_handle );
+void tr_eventInit( struct tr_handle_s * tr_handle );
 
-extern void tr_eventClose( struct tr_handle_s * tr_handle );
+void tr_eventClose( struct tr_handle_s * tr_handle );
 
 /**