Changeset 3178

Timestamp:

Sep 26, 2007, 1:55:04 AM (15 years ago)

Author:

charles

Message:

modify the tr_stat struct as hashed out by charles_ and BentMyWookie?. sync gtk, ipc, and wx clients.

Location:

trunk

Files:

• README (modified) (2 diffs)
• gtk/torrent-inspector.c (modified) (5 diffs)
• gtk/tr_core.c (modified) (1 diff)
• gtk/transmission.1 (moved) (moved from trunk/gtk/transmission-gtk.1)
• libtransmission/completion.c (modified) (2 diffs)
• libtransmission/completion.h (modified) (1 diff)
• libtransmission/ipcparse.c (modified) (3 diffs)
• libtransmission/peer-mgr-private.h (modified) (2 diffs)
• libtransmission/peer-msgs.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (2 diffs)
• wx/filter.cc (modified) (1 diff)
• wx/torrent-list.cc (modified) (6 diffs)

trunk/README

@@ -10 +10 @@
 and BeOS (native interface).
 
-For more information (including build instructions), please consult the
-website: http://transmission.m0k.org/
+For more information (including build instructions),
+please consult the website: http://transmission.m0k.org/
 
 
@@ -17 +17 @@
 =====================
 
-Transmission has an Xcode project file (Transmission.xcodeproj) that allows it to be built in Xcode.
+Transmission has an Xcode project file (Transmission.xcodeproj)
+that allows it to be built in Xcode.
 
 Building a Transmission release from the command line:

trunk/gtk/torrent-inspector.c

@@ -814 +814 @@
 {
   GtkWidget * state_lb;
+  GtkWidget * corrupt_dl_lb;
   GtkWidget * valid_dl_lb;
   GtkWidget * dl_lb;
@@ -833 +834 @@
   Activity * a = (Activity*) g_object_get_data (G_OBJECT(top), "activity-data");
   const tr_stat * stat = tr_torrent_stat( a->gtor );
-  guint64 size;
   char *pch;
 
@@ -840 +840 @@
   g_free (pch);
 
-  size = stat->downloadedValid;
-  pch = readablesize (size);
+  pch = readablesize (stat->corruptEver);
+  gtk_label_set_text (GTK_LABEL(a->corrupt_dl_lb), pch);
+  g_free (pch);
+
+  pch = readablesize (stat->haveValid);
   gtk_label_set_text (GTK_LABEL(a->valid_dl_lb), pch);
   g_free (pch);
 
-  pch = readablesize (stat->downloaded);
+  pch = readablesize (stat->downloadedEver);
   gtk_label_set_text (GTK_LABEL(a->dl_lb), pch);
   g_free (pch);
 
-  pch = readablesize (stat->uploaded);
+  pch = readablesize (stat->uploadedEver);
   gtk_label_set_text (GTK_LABEL(a->ul_lb), pch);
   g_free (pch);
 
-  pch = ratiostr (stat->downloaded, stat->uploaded);
+  pch = ratiostr (stat->downloadedEver, stat->uploadedEver);
   gtk_label_set_text (GTK_LABEL(a->ratio_lb), pch);
   g_free (pch);
@@ -861 +864 @@
   g_free (pch);
 
-  pch = readablesize (stat->left);
+  pch = readablesize (stat->leftUntilDone);
   gtk_label_set_text (GTK_LABEL(a->remaining_lb), pch);
   g_free (pch);
@@ -900 +903 @@
     g_snprintf (name, sizeof(name), namefmt, _("State"));
     l = a->state_lb = gtk_label_new (NULL);
+    hig_workarea_add_row (t, &row, name, l, NULL);
+
+    g_snprintf (name, sizeof(name), namefmt, _("Corrupt DL"));
+    l = a->corrupt_dl_lb = gtk_label_new (NULL);
     hig_workarea_add_row (t, &row, name, l, NULL);
 

trunk/gtk/tr_core.c

@@ -610 +610 @@
                             MC_DONE,        st->completedFromTracker,
                             MC_TRACKER,     st->tracker,
-                            MC_DOWN,        st->downloaded,
-                            MC_UP,          st->uploaded,
-                            MC_LEFT,        st->left,
+                            MC_DOWN,        st->downloadedEver,
+                            MC_UP,          st->uploadedEver,
+                            MC_LEFT,        st->leftUntilDone,
                             -1 );
     }

trunk/libtransmission/completion.c

@@ -291 +291 @@
 
 uint64_t
-tr_cpDownloadedValid( const tr_completion * cp )
+tr_cpHaveValid( const tr_completion * cp )
 {
     uint64_t b = 0;
@@ -309 +309 @@
    return b;
 }
+
+uint64_t
+tr_cpHaveTotal( const tr_completion * cp )
+{
+   return cp->completeHave;
+}

trunk/libtransmission/completion.h

@@ -37 +37 @@
 
 cp_status_t      tr_cpGetStatus ( const tr_completion * );
-uint64_t         tr_cpDownloadedValid( const tr_completion * );
+uint64_t         tr_cpHaveTotal( const tr_completion * );
+uint64_t         tr_cpHaveValid( const tr_completion * );
 uint64_t         tr_cpLeftUntilComplete( const tr_completion * );
 uint64_t         tr_cpLeftUntilDone( const tr_completion * );

trunk/libtransmission/ipcparse.c

@@ -768 +768 @@
         {
             case IPC_ST_COMPLETED:
-                tr_bencInitInt( item, st->downloadedValid );
+            case IPC_ST_DOWNVALID:
+                tr_bencInitInt( item, st->haveValid );
                 break;
             case IPC_ST_DOWNSPEED:
@@ -774 +775 @@
                 break;
             case IPC_ST_DOWNTOTAL:
-                tr_bencInitInt( item, st->downloaded );
-                break;
-            case IPC_ST_DOWNVALID:
-                tr_bencInitInt( item, st->downloadedValid );
+                tr_bencInitInt( item, st->downloadedEver );
                 break;
             case IPC_ST_ERROR:
@@ -922 +920 @@
                 break;
             case IPC_ST_UPTOTAL:
-                tr_bencInitInt( item, st->uploaded );
+                tr_bencInitInt( item, st->uploadedEver );
                 break;
             default:

trunk/libtransmission/peer-mgr-private.h

@@ -31 +31 @@
     unsigned int  doDisconnect : 1;
 
+    uint8_t from;
+    uint16_t port;
     struct in_addr in_addr;
-    uint16_t port;
     struct tr_peerIo * io;
-    uint8_t from;
 
     struct tr_bitfield * banned;
@@ -46 +46 @@
     time_t clientSentPieceDataAt;
     time_t peerSentPieceDataAt;
-    time_t peerSentKeepaliveAt;
     time_t chokeChangedAt;
     time_t connectionChangedAt;

trunk/libtransmission/peer-msgs.c

@@ -621 +621 @@
     tr_peerIoReadUint32( msgs->io, inbuf, &len );
 
-    if( len == 0 ) { /* peer sent us a keepalive message */
+    if( len == 0 ) /* peer sent us a keepalive message */
         dbgmsg( msgs, "peer sent us a keepalive message..." );
-        msgs->info->peerSentKeepaliveAt = time( NULL );
-    } else {
+    else {
         dbgmsg( msgs, "peer is sending us a message with %"PRIu64" bytes...\n", (uint64_t)len );
         msgs->incomingMessageLength = len;
         msgs->state = AWAITING_BT_MESSAGE;
-    } return READ_AGAIN;
+    }
+
+    return READ_AGAIN;
 }
 

trunk/libtransmission/torrent.c

@@ -761 +761 @@
 
     s->percentDone = tr_cpPercentDone( tor->completion );
-    s->left = tr_cpLeftUntilDone( tor->completion );
+    s->leftUntilDone = tr_cpLeftUntilDone( tor->completion );
 
     switch( tor->runStatus ) {
@@ -802 +802 @@
     s->eta = s->rateDownload < 0.1
         ? -1.0f
-        : (s->left / s->rateDownload / 1024.0);
-
-    s->corrupt         = tor->corruptCur    + tor->corruptPrev;
-    s->uploaded        = tor->uploadedCur   + tor->uploadedPrev;
-    s->downloaded      = tor->downloadedCur + tor->downloadedPrev;
-    s->downloadedValid = tr_cpDownloadedValid( tor->completion );
+        : (s->leftUntilDone / s->rateDownload / 1024.0);
+
+    s->corruptEver     = tor->corruptCur    + tor->corruptPrev;
+    s->downloadedEver  = tor->downloadedCur + tor->downloadedPrev;
+    s->uploadedEver    = tor->uploadedCur   + tor->uploadedPrev;
+    s->haveValid       = tr_cpHaveValid( tor->completion );
+    s->haveUnchecked   = tr_cpHaveTotal( tor->completion ) - s->haveValid;
    
-    s->ratio = s->downloaded || s->downloadedValid
-      ? (float)s->uploaded / (float)MAX(s->downloaded, s->downloadedValid)
-      : TR_RATIO_NA; 
+    s->ratio = s->downloadedEver ? s->uploadedEver / (float)s->downloadedEver
+                                 : TR_RATIO_NA;
     
     tr_torrentUnlock( tor );

trunk/libtransmission/transmission.h

@@ -63 +63 @@
 #define TR_DEFAULT_PORT   9090
 
-#define TR_PEER_FROM__MAX       4
-#define TR_PEER_FROM_INCOMING   0 /* connections made to the listening port */
-#define TR_PEER_FROM_TRACKER    1 /* peers received from a tracker */
-#define TR_PEER_FROM_CACHE      2 /* peers read from the peer cache */
-#define TR_PEER_FROM_PEX        3 /* peers discovered via PEX */
+enum
+{
+    TR_PEER_FROM_INCOMING  = 0,  /* connections made to the listening port */
+    TR_PEER_FROM_TRACKER   = 1,  /* peers received from a tracker */
+    TR_PEER_FROM_CACHE     = 2,  /* peers read from the peer cache */
+    TR_PEER_FROM_PEX       = 3,  /* peers discovered via PEX */
+    TR_PEER_FROM__MAX
+};
 
 /***********************************************************************
@@ -645 +648 @@
     int                 completedFromTracker;
 
-    uint64_t            left;
-    uint64_t            downloaded;
-    uint64_t            downloadedValid;
-    uint64_t            uploaded;
-    uint64_t            corrupt;
+    /* Byte count of how much data is left to be downloaded until
+     * we're done -- that is, until we've got all the pieces we wanted. */
+    uint64_t            leftUntilDone;
+
+    /* Byte count of all the corrupt data you've ever downloaded for
+     * this torrent.  If you're on a poisoned torrent, this number can
+     * grow very large. */
+    uint64_t            corruptEver;
+
+    /* Byte count of all data you've ever uploaded for this torrent. */
+    uint64_t            uploadedEver;
+
+    /* Byte count of all the non-corrupt data you've ever downloaded
+     * for this torrent.  If you deleted the files and downloaded a second time,
+     * this will be 2*totalSize.. */
+    uint64_t            downloadedEver;
+
+    /* Byte count of all the checksum-verified data we have for this torrent. */
+    uint64_t            haveValid;
+
+    /* Byte count of all the partial piece data we have for this torrent.
+     * As pieces become complete, this value may decrease as portions of it are
+     * moved to `corrupt' or `haveValid'. */
+    uint64_t            haveUnchecked;
+
     float               swarmspeed;
 

trunk/wx/filter.cc

@@ -50 +50 @@
         : FLAG_IDLE;
 
-    flags |= s->left
+    flags |= s->leftUntilDone
         ? FLAG_INCOMPLETE
         : FLAG_COMPLETE;

trunk/wx/torrent-list.cc

@@ -275 +275 @@
 
             case COL_RATIO:
-                xstr = wxString::Format( _T("%%%d"), (int)(s->uploaded / (double)s->downloadedValid) );
+                xstr = wxString::Format( _T("%%%d"), (int)(s->uploadedEver / (double)s->downloadedEver) );
                 break;
 
             case COL_RECEIVED:
-                xstr = getReadableSize( s->downloaded );
+                xstr = getReadableSize( s->downloadedEver );
                 break;
 
             case COL_REMAINING:
-                xstr = getReadableSize( s->left );
+                xstr = getReadableSize( s->leftUntilDone );
                 break;
 
@@ -294 +294 @@
 
             case COL_SENT:
-                xstr = getReadableSize( s->uploaded );
+                xstr = getReadableSize( s->uploadedEver );
                 break;
 
@@ -448 +448 @@
 
         case COL_RATIO: {
-            const double ra = sa->uploaded / (double) sa->downloadedValid;
-            const double rb = sb->uploaded / (double) sb->downloadedValid;
+            const double ra = sa->uploadedEver / (double)(sa->downloadedEver + 0.01);
+            const double rb = sb->uploadedEver / (double)(sb->downloadedEver + 0.01);
             if( ra < rb )
                 ret = -1;
@@ -460 +460 @@
 
         case COL_RECEIVED:
-            if( sa->downloaded < sb->downloaded )
+            if( sa->downloadedEver < sb->downloadedEver )
                 ret = -1;
-            else if( sa->downloaded > sb->downloaded )
+            else if( sa->downloadedEver > sb->downloadedEver )
                 ret = 1;
             else
@@ -469 +469 @@
 
         case COL_REMAINING:
-            if( sa->left < sb->left )
+            if( sa->leftUntilDone < sb->leftUntilDone )
                 ret = -1;
-            else if( sa->left > sb->left )
+            else if( sa->leftUntilDone > sb->leftUntilDone )
                 ret = 1;
             else
@@ -483 +483 @@
 
         case COL_SENT:
-            if( sa->uploaded < sb->uploaded )
+            if( sa->uploadedEver < sb->uploadedEver )
                 ret = -1;
-            else if( sa->uploaded > sb->uploaded )
+            else if( sa->uploadedEver > sb->uploadedEver )
                 ret = 1;
             else