Changeset 2356

Timestamp:

Jul 15, 2007, 5:19:07 PM (15 years ago)

Author:

charles

Message:

split tr_stat_t's peersTotal into peersTotal and peersConnected

Location:

trunk

Files:

• cli/transmissioncli.c (modified) (1 diff)
• gtk/tr_core.c (modified) (2 diffs)
• gtk/tr_torrent.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)

trunk/cli/transmissioncli.c

@@ -261 +261 @@
                 "Progress: %.2f %%, %d peer%s, dl from %d (%.2f KB/s), "
                 "ul to %d (%.2f KB/s) [%s]", 100.0 * s->percentDone,
-                s->peersTotal, ( s->peersTotal == 1 ) ? "" : "s",
+                s->peersConnected, ( s->peersConnected == 1 ) ? "" : "s",
                 s->peersUploading, s->rateDownload,
                 s->peersDownloading, s->rateUpload,

trunk/gtk/tr_core.c

@@ -214 +214 @@
         /* error,   errorString,   percentComplete, percentDone,  rateDownload, rateUpload, */
         G_TYPE_INT, G_TYPE_STRING, G_TYPE_FLOAT,    G_TYPE_FLOAT, G_TYPE_FLOAT, G_TYPE_FLOAT,
-        /* eta,     peersTotal, peersUploading, peersDownloading, seeders, */
-        G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,     G_TYPE_INT,       G_TYPE_INT,
+        /* eta,     peersConnected, peersUploading, peersDownloading, seeders, */
+        G_TYPE_INT, G_TYPE_INT,     G_TYPE_INT,     G_TYPE_INT,       G_TYPE_INT,
         /* leechers, completedFromTracker, downloaded,    uploaded */
         G_TYPE_INT,  G_TYPE_INT,           G_TYPE_UINT64, G_TYPE_UINT64,
@@ -611 +611 @@
                             MC_URATE,       st->rateUpload,
                             MC_ETA,         st->eta,
-                            MC_PEERS,       st->peersTotal,
+                            MC_PEERS,       st->peersConnected,
                             MC_UPEERS,      st->peersUploading,
                             MC_DPEERS,      st->peersDownloading,

trunk/gtk/tr_torrent.c

@@ -605 +605 @@
     const tr_stat_t * st = tr_torrent_stat( gtor );
 
-    const int tpeers = MAX (st->peersTotal, 0);
+    const int tpeers = MAX (st->peersConnected, 0);
     const int upeers = MAX (st->peersUploading, 0);
     const int eta = st->eta;

trunk/libtransmission/torrent.c

@@ -550 +550 @@
     /* peers... */
     memset( s->peersFrom, 0, sizeof( s->peersFrom ) );
-    s->peersTotal       = 0;
-    s->peersUploading   = 0;
-    s->peersDownloading = 0;
+    s->peersTotal        = tor->peerCount;
+    s->peersConnected    = 0;
+    s->peersUploading    = 0;
+    s->peersDownloading  = 0;
+
     for( i=0; i<tor->peerCount; ++i )
     {
         const tr_peer_t * peer = tor->peers[i];
-        ++s->peersTotal;
+
         if( tr_peerIsConnected( peer ) )
         {
+            ++s->peersConnected;
             ++s->peersFrom[tr_peerIsFrom(peer)];
 
-            /*if( tr_peerIsInterested( peer ) && !tr_peerIsChokedByUs( peer ) )*/
             if( tr_peerDownloadRate( peer ) > 0.01 )
                 ++s->peersUploading;
 
-            /*if( tr_peerIsInteresting( peer ) && !tr_peerIsChokingUs( peer ) )*/
             if( tr_peerUploadRate( peer ) > 0.01 )
                 ++s->peersDownloading;
@@ -571 +572 @@
     }
 
-    s->percentDone = tr_cpPercentDone( tor->completion );
-    s->percentComplete = tr_cpPercentComplete( tor->completion );
-    s->left     = tr_cpLeftUntilDone( tor->completion );
+    s->percentDone     = tr_cpPercentDone     ( tor->completion );
+    s->percentComplete = tr_cpPercentComplete ( tor->completion );
+    s->left            = tr_cpLeftUntilDone   ( tor->completion );
 
 

trunk/libtransmission/transmission.h

@@ -586 +586 @@
     int                 eta;
     int                 peersTotal;
+    int                 peersConnected;
     int                 peersFrom[TR_PEER_FROM__MAX];
     int                 peersUploading;