Changeset 3861

Timestamp:

Nov 17, 2007, 11:43:33 PM (15 years ago)

Author:

charles

Message:

Add "Status" column to tr_peer_stat.

Location:

trunk

Files:

• gtk/torrent-inspector.c (modified) (7 diffs)
• libtransmission/peer-mgr-private.h (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (5 diffs)
• libtransmission/peer-msgs.c (modified) (9 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)

trunk/gtk/torrent-inspector.c

@@ -240 +240 @@
   PEER_COL_IS_UPLOADING,
   PEER_COL_UPLOAD_RATE,
+  PEER_COL_STATUS,
   N_PEER_COLS
 };
@@ -253 +254 @@
   N_("DL Rate"),
   N_("Uploading"),
-  N_("UL Rate")
+  N_("UL Rate"),
+  N_("Status")
 };
 
@@ -289 +291 @@
                       PEER_COL_IS_UPLOADING, peer->isUploading,
                       PEER_COL_UPLOAD_RATE, peer->uploadToRate,
+                      PEER_COL_STATUS, peer->status,
                       -1);
 }
@@ -317 +320 @@
                                          G_TYPE_FLOAT,   /* downloadFromRate */
                                          G_TYPE_BOOLEAN, /* isUploading */
-                                         G_TYPE_FLOAT);  /* uploadToRate */
+                                         G_TYPE_FLOAT,   /* uploadToRate */
+                                         G_TYPE_INT );   /* tr_peer_status */
 
   int n_peers = 0;
@@ -341 +345 @@
                           "stock-id", (is_encrypted ? "transmission-lock" : NULL),
                           NULL);
+}
+
+static void
+render_status( GtkTreeViewColumn  * column UNUSED,
+               GtkCellRenderer    * renderer,
+               GtkTreeModel       * tree_model,
+               GtkTreeIter        * iter,
+               gpointer             data UNUSED )
+{
+    int status;
+    const char * text;
+    gtk_tree_model_get( tree_model, iter, PEER_COL_STATUS, &status, -1 );
+    switch( status )
+    {
+        case TR_PEER_STATUS_HANDSHAKE:            text = _( "Handshaking" ); break;
+        case TR_PEER_STATUS_PEER_IS_CHOKED:       text = _( "Peer is Choked" ); break;
+        case TR_PEER_STATUS_CLIENT_IS_CHOKED:     text = _( "Choked" ); break;
+        case TR_PEER_STATUS_CLIENT_IS_INTERESTED: text = _( "Choked and Interested" ); break;
+        case TR_PEER_STATUS_READY:                text = _( "Ready" ); break;
+        case TR_PEER_STATUS_REQUEST_SENT:         text = _( "Request Sent" ); break;
+        case TR_PEER_STATUS_ACTIVE           :    text = _( "Active" ); break;
+        default:                                  text = "BUG"; break;
+    }
+    g_object_set (renderer, "text", text, NULL);
 }
 
@@ -496 +524 @@
                          PEER_COL_IS_ENCRYPTED,
                          PEER_COL_UPLOAD_RATE,
-                         PEER_COL_DOWNLOAD_RATE };
+                         PEER_COL_DOWNLOAD_RATE,
+                         PEER_COL_STATUS };
 
   m  = peer_model_new (tor);
@@ -569 +598 @@
                                                  NULL, NULL);
         break;
+
+      case PEER_COL_STATUS:
+        r = gtk_cell_renderer_text_new( );
+        c = gtk_tree_view_column_new_with_attributes (t, r, "text", col, NULL);
+        gtk_tree_view_column_set_cell_data_func (c, r, render_status, NULL, NULL);
+        break;
+        
 
       default:

trunk/libtransmission/peer-mgr-private.h

@@ -37 +37 @@
     unsigned int  doPurge : 1;
 
+    tr_peer_status status;
 
     /* number of bad pieces they've contributed to */

trunk/libtransmission/peer-mgr.c

@@ -36 +36 @@
 #include "ratecontrol.h"
 #include "shared.h"
+#include "trcompat.h" /* strlcpy */
 #include "trevent.h"
 #include "utils.h"
@@ -1414 +1415 @@
 
         tr_netNtop( &peer->in_addr, stat->addr, sizeof(stat->addr) );
+        strlcpy( stat->client, (peer->client ? peer->client : ""), sizeof(stat->client) );
         stat->port             = peer->port;
         stat->from             = atom->from;
-        stat->client           = tr_strdup( peer->client ? peer->client : "" );
         stat->progress         = peer->progress;
         stat->isEncrypted      = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
@@ -1423 +1424 @@
         stat->isDownloading    = stat->uploadToRate > 0.01;
         stat->isUploading      = stat->downloadFromRate > 0.01;
+        stat->status           = peer->status;
     }
 
@@ -1483 +1485 @@
 rechoke( Torrent * t )
 {
-    int i, peerCount, size=0, unchoked=0;
+    int i, peerCount, size=0;
     const time_t fibrillationTime = time(NULL) - MIN_CHOKE_PERIOD_SEC;
     tr_peer ** peers = getConnectedPeers( t, &peerCount );
@@ -1506 +1508 @@
     qsort( choke, size, sizeof(struct ChokeData), compareChoke );
 
-    for( i=0; i<size && i<NUM_UNCHOKED_PEERS_PER_TORRENT; ++i ) {
+    for( i=0; i<size && i<NUM_UNCHOKED_PEERS_PER_TORRENT; ++i )
         choke[i].doUnchoke = 1;
-        ++unchoked;
-    }
 
     for( ; i<size; ++i ) {
         choke[i].doUnchoke = 1;
-        ++unchoked;
         if( choke[i].peer->peerIsInterested )
             break;

trunk/libtransmission/peer-msgs.c

@@ -141 +141 @@
     time_t clientSentAnythingAt;
 
+    unsigned int peerSentBitfield         : 1;
     unsigned int peerSupportsPex          : 1;
     unsigned int clientSentLtepHandshake  : 1;
@@ -1027 +1028 @@
 clientGotBlock( tr_peermsgs * msgs, const uint8_t * block, const struct peer_request * req );
 
+static void
+clientGotBytes( tr_peermsgs * msgs, uint32_t byteCount )
+{
+    tr_torrent * tor = msgs->torrent;
+    tor->activityDate = tr_date( );
+    tor->downloadedCur += byteCount;
+    msgs->info->pieceDataActivityDate = time( NULL );
+    tr_rcTransferred( msgs->info->rcToClient, byteCount );
+    tr_rcTransferred( tor->download, byteCount );
+    tr_rcTransferred( tor->handle->download, byteCount );
+}
+
+
 static int
 readBtPiece( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
@@ -1054 +1068 @@
         tr_peerIoReadBytes( msgs->io, inbuf, buf, n );
         evbuffer_add( msgs->incoming.block, buf, n );
+        clientGotBytes( msgs, n );
         tr_free( buf );
         dbgmsg( msgs, "got %d bytes for block %u:%u->%u ... %d remain",
@@ -1139 +1154 @@
             const int clientIsSeed = tr_torrentIsSeed( msgs->torrent );
             dbgmsg( msgs, "got a bitfield" );
+            msgs->peerSentBitfield = 1;
             tr_peerIoReadBytes( msgs->io, inbuf, msgs->info->have->bits, msglen );
             updatePeerProgress( msgs );
@@ -1234 +1250 @@
 
 static void
-clientGotBytes( tr_peermsgs * msgs, uint32_t byteCount )
-{
-    tr_torrent * tor = msgs->torrent;
-    tor->activityDate = tr_date( );
-    tor->downloadedCur += byteCount;
-    msgs->info->pieceDataActivityDate = time( NULL );
-    tr_rcTransferred( msgs->info->rcToClient, byteCount );
-    tr_rcTransferred( tor->download, byteCount );
-    tr_rcTransferred( tor->handle->download, byteCount );
-}
-
-static void
 peerGotBytes( tr_peermsgs * msgs, uint32_t byteCount )
 {
@@ -1369 +1373 @@
 
     msgs->info->peerSentPieceDataAt = time( NULL );
-    clientGotBytes( msgs, req->length );
     i = tr_ioWrite( tor, req->index, req->offset, req->length, data );
     if( i )
@@ -1481 +1484 @@
 }
 
+static void
+updatePeerStatus( tr_peermsgs * msgs )
+{
+    tr_peer * peer = msgs->info;
+
+    if( !msgs->peerSentBitfield )
+        peer->status = TR_PEER_STATUS_HANDSHAKE;
+
+    else if( ( time(NULL) - peer->pieceDataActivityDate ) < 3 )
+        peer->status = TR_PEER_STATUS_ACTIVE;
+
+    else if( peer->clientIsChoked )
+        peer->status = TR_PEER_STATUS_CLIENT_IS_CHOKED;
+
+    else if( peer->peerIsChoked )
+        peer->status = TR_PEER_STATUS_PEER_IS_CHOKED;
+
+    else if( msgs->clientAskedFor != NULL )
+        peer->status = TR_PEER_STATUS_REQUEST_SENT;
+
+    else if( peer->clientIsInterested )
+        peer->status = TR_PEER_STATUS_CLIENT_IS_INTERESTED;
+
+    else
+        peer->status = TR_PEER_STATUS_READY;
+}
+
 static int
 pulse( void * vmsgs )
@@ -1490 +1520 @@
 
     tr_peerIoTryRead( msgs->io );
-
     pumpRequestQueue( msgs );
+    updatePeerStatus( msgs );
 
     if( !canWrite( msgs ) )
@@ -1741 +1771 @@
     m->torrent = torrent;
     m->io = info->io;
+    m->info->status = TR_PEER_STATUS_HANDSHAKE;
     m->info->clientIsChoked = 1;
     m->info->peerIsChoked = 1;

trunk/libtransmission/torrent.c

@@ -881 +881 @@
 
 void
-tr_torrentPeersFree( tr_peer_stat * peers, int peerCount )
-{
-    int i;
-    for( i=0; i<peerCount; ++i )
-        tr_free( (char*) peers[i].client );
+tr_torrentPeersFree( tr_peer_stat * peers, int peerCount UNUSED )
+{
     tr_free( peers );
 }

trunk/libtransmission/transmission.h

@@ -684 +684 @@
 };
 
+typedef enum
+{
+    TR_PEER_STATUS_HANDSHAKE,
+    TR_PEER_STATUS_PEER_IS_CHOKED,
+    TR_PEER_STATUS_CLIENT_IS_CHOKED,
+    TR_PEER_STATUS_CLIENT_IS_INTERESTED,
+    TR_PEER_STATUS_READY,
+    TR_PEER_STATUS_REQUEST_SENT,
+    TR_PEER_STATUS_ACTIVE
+}
+tr_peer_status;
+
 struct tr_peer_stat
 {
-    char    addr[INET_ADDRSTRLEN];
-    const char * client;
+    char addr[INET_ADDRSTRLEN];
+    char client[80];
     
     unsigned int isEncrypted   : 1;
     unsigned int isDownloading : 1;
     unsigned int isUploading   : 1;
+
+    tr_peer_status status;
 
     uint8_t  from;