Changeset 9253

Timestamp:

Oct 9, 2009, 9:30:34 PM (13 years ago)

Author:

charles

Message:

(trunk) #2463: 'Mac Client shows huge "next announce in" timer'

Location:

trunk

Files:

• daemon/remote.c (modified) (6 diffs)
• doc/rpc-spec.txt (modified) (3 diffs)
• gtk/details.c (modified) (2 diffs)
• libtransmission/announcer.c (modified) (5 diffs)
• libtransmission/rpcimpl.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (4 diffs)

trunk/daemon/remote.c

@@ -1248 +1248 @@
                     const char * host;
                     tr_bool isActive; 
-                    tr_bool isAnnouncing; 
-                    tr_bool isScraping; 
                     int64_t lastAnnouncePeerCount; 
                     const char * lastAnnounceResult; 
@@ -1264 +1262 @@
                     int64_t seederCount;
                     int64_t tier;
-                    tr_bool willAnnounce;
-                    tr_bool willScrape;
+                    int64_t announceState;
+                    int64_t scrapeState;
            
                     if( tr_bencDictFindInt ( t, "downloadCount", &downloadCount ) &&
@@ -1272 +1270 @@
                         tr_bencDictFindStr ( t, "host", &host ) &&
                         tr_bencDictFindBool( t, "isActive", &isActive ) &&
-                        tr_bencDictFindBool( t, "isAnnouncing", &isAnnouncing ) &&
-                        tr_bencDictFindBool( t, "isScraping", &isScraping ) &&
+                        tr_bencDictFindInt ( t, "announceState", &announceState ) &&
+                        tr_bencDictFindInt ( t, "scrapeState", &scrapeState ) &&
                         tr_bencDictFindInt ( t, "lastAnnouncePeerCount", &lastAnnouncePeerCount ) &&
                         tr_bencDictFindStr ( t, "lastAnnounceResult", &lastAnnounceResult ) &&
@@ -1287 +1285 @@
                         tr_bencDictFindInt ( t, "nextScrapeTime", &nextScrapeTime ) &&
                         tr_bencDictFindInt ( t, "seederCount", &seederCount ) &&
-                        tr_bencDictFindInt ( t, "tier", &tier ) &&
-                        tr_bencDictFindBool( t, "willAnnounce", &willAnnounce ) &&
-                        tr_bencDictFindBool( t, "willScrape", &willScrape ) )
+                        tr_bencDictFindInt ( t, "tier", &tier ) )
                     {
                         const time_t now = time( NULL );
@@ -1311 +1307 @@
                         }
 
-                        if( isActive && ( isAnnouncing || willAnnounce ) ) {
-                            if( !isAnnouncing ) {
+                        if( isActive ) switch( announceState ) {
+                            case TR_TRACKER_INACTIVE:
+                                printf( "  No updates scheduled\n" );
+                                break;
+                            case TR_TRACKER_WAITING:
                                 tr_strltime( buf, nextAnnounceTime - now, sizeof( buf ) );
                                 printf( "  Asking for more peers in %s\n", buf );
-                            } else {
+                                break;
+                            case TR_TRACKER_QUEUED:
+                                printf( "  Queued to ask for more peers\n" );
+                                break;
+                            case TR_TRACKER_ACTIVE:
                                 tr_strltime( buf, now - lastAnnounceStartTime, sizeof( buf ) );
                                 printf( "  Asking for more peers now... %s\n", buf );
-                            }
+                                break;
                         }
 
-                        if( !hasAnnounced && !isAnnouncing && !willAnnounce )
-                          printf( "  No updates scheduled\n" );
-
-                        if( isActive && hasScraped ) {
+                        if( isActive && hasScraped )
+                        {
                             tr_strltime( buf, now - lastScrapeTime, sizeof( buf ) );
                             if( lastScrapeSucceeded )
@@ -1334 +1335 @@
                         }
 
-                        if( isScraping || willScrape ) {
-                            if( !isScraping ) {
+                        switch( scrapeState ) {
+                            case TR_TRACKER_INACTIVE:
+                                break;
+                            case TR_TRACKER_WAITING:
                                 tr_strltime( buf, nextScrapeTime - now, sizeof( buf ) );
                                 printf( "  Asking for peer counts in %s\n", buf );
-                            } else {
+                                break;
+                            case TR_TRACKER_QUEUED:
+                                printf( "  Queued to ask for peer counts\n" );
+                                break;
+                            case TR_TRACKER_ACTIVE:
                                 tr_strltime( buf, now - lastScrapeStartTime, sizeof( buf ) );
                                 printf( "  Asking for peer counts now... %s\n", buf );
-                            }
+                                break;
                         }
                     }

trunk/doc/rpc-spec.txt

@@ -252 +252 @@
                       +-------------------------+------------+
                       | announce                | string     | tr_tracker_stat
+                      | announceState           | number     | tr_tracker_stat
                       | downloadCount           | number     | tr_tracker_stat
                       | hasAnnounced            | boolean    | tr_tracker_stat
@@ -257 +258 @@
                       | host                    | string     | tr_tracker_stat
                       | isActive                | boolean    | tr_tracker_stat
-                      | isAnnouncing            | boolean    | tr_tracker_stat
-                      | isScraping              | boolean    | tr_tracker_stat
                       | lastAnnouncePeerCount   | number     | tr_tracker_stat
                       | lastAnnounceResult      | number     | tr_tracker_stat
@@ -271 +270 @@
                       | nextAnnounceTime        | number     | tr_tracker_stat
                       | nextScrapeTime          | number     | tr_tracker_stat
+                      | scrapeState             | number     | tr_tracker_stat
                       | seederCount             | number     | tr_tracker_stat
                       | tier                    | number     | tr_tracker_stat
-                      | willAnnounce            | boolean    | tr_tracker_stat
-                      | willScrape              | boolean    | tr_tracker_stat
    -------------------+-------------------------+------------+
    wanted             | an array of tr_info.fileCount        | tr_info

trunk/gtk/details.c

@@ -1636 +1636 @@
     }
 
-    if( st->isActive && ( st->isAnnouncing || st->willAnnounce ) ) {
-        g_string_append_c( gstr, '\n' );
-        if( !st->isAnnouncing ) {
+    if( st->isActive ) switch( st->announceState ) {
+        case TR_TRACKER_INACTIVE:
+            if( !st->hasAnnounced ) {
+                g_string_append_c( gstr, '\n' );
+                g_string_append( gstr, _( "No updates scheduled" ) );
+            }
+            break;
+        case TR_TRACKER_WAITING:
             tr_strltime_rounded( timebuf, st->nextAnnounceTime - now, sizeof( timebuf ) );
+            g_string_append_c( gstr, '\n' );
             g_string_append_printf( gstr, _( "Asking for more peers in %s" ), timebuf );
-        } else {
+            break;
+        case TR_TRACKER_QUEUED:
+            g_string_append_c( gstr, '\n' );
+            g_string_append( gstr, _( "Queued to ask for more peers" ) );
+            break;
+        case TR_TRACKER_ACTIVE:
             tr_strltime_rounded( timebuf, now - st->lastAnnounceStartTime, sizeof( timebuf ) );
             g_string_append_printf( gstr, _( "Asking for more peers now... <small>%s</small>" ), timebuf );
-        }
-    }
-
-    if( !st->hasAnnounced && !st->isAnnouncing && !st->willAnnounce ) {
-        g_string_append_c( gstr, '\n' );
-        g_string_append( gstr, _( "No updates scheduled" ) );
+            break;
     }
 
@@ -1665 +1671 @@
         }
 
-        if( st->isScraping || st->willScrape ) {
-            g_string_append_c( gstr, '\n' );
-            if( !st->isScraping ) {
+        switch( st->scrapeState )
+        {
+            case TR_TRACKER_INACTIVE:
+                break;
+            case TR_TRACKER_WAITING:
+                g_string_append_c( gstr, '\n' );
+                tr_strltime_rounded( timebuf, now - st->lastScrapeStartTime, sizeof( timebuf ) );
+                g_string_append_printf( gstr, _( "Asking for peer counts now... <small>%s</small>" ), timebuf );
+                break;
+            case TR_TRACKER_QUEUED:
+                g_string_append_c( gstr, '\n' );
+                g_string_append( gstr, _( "Queued to ask for peer counts" ) );
+                break;
+            case TR_TRACKER_ACTIVE:
+                g_string_append_c( gstr, '\n' );
                 tr_strltime_rounded( timebuf, st->nextScrapeTime - now, sizeof( timebuf ) );
                 g_string_append_printf( gstr, _( "Asking for peer counts in %s" ), timebuf );
-            } else {
-                tr_strltime_rounded( timebuf, now - st->lastScrapeStartTime, sizeof( timebuf ) );
-                g_string_append_printf( gstr, _( "Asking for peer counts now... <small>%s</small>" ), timebuf );
-            }
-        }
-    }
-      
+                break;
+        }
+    }
+
     return g_string_free( gstr, FALSE );
 }

trunk/libtransmission/announcer.c

@@ -1635 +1635 @@
     int tierCount;
     tr_tracker_stat * ret;
+    const time_t now = time( NULL );
 
     assert( tr_isTorrent( torrent ) );
@@ -1671 +1672 @@
                 st->lastScrapeSucceeded = FALSE;
                 st->lastScrapeResult[0] = '\0';
-                st->isScraping = FALSE;
-                st->willScrape = FALSE;
+                st->scrapeState = TR_TRACKER_INACTIVE;
+                st->announceState = TR_TRACKER_INACTIVE;
                 st->nextScrapeTime = 0;
                 st->lastAnnounceStartTime = 0;
@@ -1680 +1681 @@
                 st->lastAnnounceSucceeded = FALSE;
                 st->lastAnnouncePeerCount = 0;
-                st->isAnnouncing = FALSE;
-                st->willAnnounce = FALSE;
                 st->nextAnnounceTime = 0;
                 st->seederCount = 0;
@@ -1695 +1694 @@
                 }
 
-                st->isScraping = tier->isScraping;
-
-                if(( st->willScrape = !tier->isScraping ))
+                if( tier->isScraping )
+                    st->scrapeState = TR_TRACKER_ACTIVE;
+                else if( tierNeedsToScrape( tier, now ) )
+                    st->scrapeState = TR_TRACKER_QUEUED;
+                else {
+                    st->scrapeState = TR_TRACKER_WAITING;
                     st->nextScrapeTime = tier->scrapeAt;
+                }
 
                 st->lastAnnounceStartTime = tier->lastAnnounceStartTime;
@@ -1710 +1713 @@
                 }
 
-                st->isAnnouncing = tier->isAnnouncing;
-
-                if(( st->willAnnounce = torrent->isRunning && !tier->isAnnouncing ))
+                if( tier->isAnnouncing )
+                    st->announceState = TR_TRACKER_ACTIVE;
+                else if( !torrent->isRunning )
+                    st->announceState = TR_TRACKER_INACTIVE;
+                else if( tierNeedsToAnnounce( tier, now ) )
+                    st->announceState = TR_TRACKER_QUEUED;
+                else {
+                    st->announceState = TR_TRACKER_WAITING;
                     st->nextAnnounceTime = tier->announceAt;
+                }
 
                 st->seederCount = tracker->seederCount;

trunk/libtransmission/rpcimpl.c

@@ -375 +375 @@
     {
         const tr_tracker_stat * s = &st[i];
-        tr_benc * d = tr_bencListAddDict( list, 24 );
+        tr_benc * d = tr_bencListAddDict( list, 22 );
         tr_bencDictAddStr ( d, "announce", s->announce );
+        tr_bencDictAddInt ( d, "announceState", s->announceState );
         tr_bencDictAddInt ( d, "downloadCount", s->downloadCount );
         tr_bencDictAddBool( d, "hasAnnounced", s->hasAnnounced );
@@ -382 +383 @@
         tr_bencDictAddStr ( d, "host", s->host );
         tr_bencDictAddBool( d, "isActive", s->isActive );
-        tr_bencDictAddBool( d, "isAnnouncing", s->isAnnouncing );
-        tr_bencDictAddBool( d, "isScraping", s->isScraping );
         tr_bencDictAddInt ( d, "lastAnnouncePeerCount", s->lastAnnouncePeerCount );
         tr_bencDictAddStr ( d, "lastAnnounceResult", s->lastAnnounceResult );
@@ -396 +395 @@
         tr_bencDictAddInt ( d, "nextAnnounceTime", s->nextAnnounceTime );
         tr_bencDictAddInt ( d, "nextScrapeTime", s->nextScrapeTime );
+        tr_bencDictAddInt ( d, "scrapeState", s->scrapeState );
         tr_bencDictAddInt ( d, "seederCount", s->seederCount );
         tr_bencDictAddInt ( d, "tier", s->tier );
-        tr_bencDictAddBool( d, "willAnnounce", s->willAnnounce );
-        tr_bencDictAddBool( d, "willScrape", s->willScrape );
     }
 }

trunk/libtransmission/transmission.h

@@ -1231 +1231 @@
 ***/
 
+typedef enum
+{
+    /* we won't (announce,scrape) this torrent to this tracker because
+     * the torrent is stopped, or because of an error, or whatever */
+    TR_TRACKER_INACTIVE,
+
+    /* we will (announce,scrape) this torrent to this tracker, and are
+     * waiting for enough time to pass to satisfy the tracker's interval */
+    TR_TRACKER_WAITING,
+
+    /* it's time to (announce,scrape) this torrent, and we're waiting on a
+     * a free slot to open up in the announce manager */
+    TR_TRACKER_QUEUED,
+
+    /* we're (announcing,scraping) this torrent right now */
+    TR_TRACKER_ACTIVE
+}
+tr_tracker_state;
+
 typedef struct
 {
@@ -1252 +1271 @@
     tr_bool isActive;
 
-    /* true if we've sent an announce and waiting for the response */
-    tr_bool isAnnouncing;
-
-    /* true if we've got a scrape request pending right now */
-    tr_bool isScraping;
+    /* is the tracker announcing, waiting, queued, etc */
+    tr_tracker_state announceState;
+
+    /* is the tracker scraping, waiting, queued, etc */
+    tr_tracker_state scrapeState;
 
     /* number of peers the tracker told us about last time.
@@ -1298 +1317 @@
 
     /* when the next periodic announce message will be sent out.
-       if "willAnnounce" is false, this field is undefined */
+       if announceState isn't TR_TRACKER_WAITING, this field is undefined */
     time_t nextAnnounceTime;
 
     /* when the next periodic scrape message will be sent out.
-       if "willScrape" is false, this field is undefined */
+       if scrapeState isn't TR_TRACKER_WAITING, this field is undefined */
     time_t nextScrapeTime;
 
@@ -1310 +1329 @@
     /* which tier this tracker is in */
     int tier;
-
-    /* true if the torrent's not announcing now, but will at nextAnnounceTime */
-    tr_bool willAnnounce;
-
-    /* true if we're not scraping now but will at nextScrapeTime */
-    tr_bool willScrape;
 }
 tr_tracker_stat;