Changeset 3260

Timestamp:

Oct 1, 2007, 4:31:17 PM (15 years ago)

Author:

charles

Message:

don't log BT protocol messages in UL/DL speed -- only log piece data transfers.

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (7 diffs)
• peer-io.h (modified) (1 diff)
• peer-mgr-private.h (modified) (1 diff)
• peer-mgr.c (modified) (11 diffs)
• peer-msgs.c (modified) (3 diffs)

trunk/libtransmission/peer-io.c

@@ -53 +53 @@
     unsigned int peerIdIsSet : 1;
 
-    tr_ratecontrol   * rateToPeer;
-    tr_ratecontrol   * rateToClient;
-
     tr_can_read_cb     canRead;
     tr_did_write_cb    didWrite;
@@ -121 +118 @@
     c->port = port;
     c->socket = socket;
-    c->rateToPeer = tr_rcInit( );
-    c->rateToClient = tr_rcInit( );
     c->isIncoming = isIncoming ? 1 : 0;
     c->bufev = bufferevent_new( c->socket,
@@ -175 +170 @@
         tr_netClose( c->socket );
 
-        tr_rcClose( c->rateToClient );
-        tr_rcClose( c->rateToPeer );
-
         tr_cryptoFree( c->crypto );
 
@@ -399 +391 @@
 {
     tr_bufferevent_write( io->handle, io->bufev, writeme, writeme_len );
-    tr_rcTransferred( io->rateToPeer, writeme_len );
 }
 
@@ -503 +494 @@
             /*fprintf( stderr, "reading %d plaintext bytes from inbuf...\n", byteCount );*/
             evbuffer_remove(  inbuf, bytes, byteCount );
-            tr_rcTransferred( io->rateToClient, byteCount );
             break;
 
@@ -510 +500 @@
             evbuffer_remove(  inbuf, bytes, byteCount );
             tr_cryptoDecrypt( io->crypto, byteCount, bytes, bytes );
-            tr_rcTransferred( io->rateToClient, byteCount );
             break;
 
@@ -555 +544 @@
     tr_free( tmp );
 }
-
-/**
-***
-**/
-
-float
-tr_peerIoGetRateToClient( const tr_peerIo * io )
-{
-    return io==NULL ? 0.0f : tr_rcRate( io->rateToClient );
-
-}
-
-float
-tr_peerIoGetRateToPeer( const tr_peerIo * io )
-{
-    return io==NULL ? 0.0f : tr_rcRate( io->rateToPeer );
-}
-

trunk/libtransmission/peer-io.h

@@ -122 +122 @@
 
 
-float tr_peerIoGetRateToClient( const tr_peerIo * io );
-
-float tr_peerIoGetRateToPeer( const tr_peerIo * io );
-
 /**
 ***

trunk/libtransmission/peer-mgr-private.h

@@ -56 +56 @@
     struct tr_peermsgs * msgs;
     tr_publisher_tag msgsTag;
+
+    struct tr_ratecontrol * rateToClient;
+    struct tr_ratecontrol * rateToPeer;
 }
 tr_peer;

trunk/libtransmission/peer-mgr.c

@@ -62 +62 @@
      * with a better idea for managing the connection limits */
     MAX_CONNECTED_PEERS_PER_TORRENT = 60,
+
+
+    ADDED_F_ENCRYPTION_FLAG = 1,
+    ADDED_F_SEED_FLAG = 2
 };
+
 
 /**
@@ -71 +76 @@
  * it's connected or not, so the struct must be small.
  * When our current connections underperform, we dip back
- * int this list for new ones. */
+ * into this list for new ones. */
 struct peer_atom
 {   
@@ -272 +277 @@
     {
         peer = tr_new0( tr_peer, 1 );
+        peer->rateToClient = tr_rcInit( );
+        peer->rateToPeer = tr_rcInit( );
         memcpy( &peer->in_addr, in_addr, sizeof(struct in_addr) );
         tr_ptrArrayInsertSorted( torrent->peers, peer, peerCompare );
@@ -308 +315 @@
 {
     disconnectPeer( peer );
+    tr_rcClose( peer->rateToClient );
+    tr_rcClose( peer->rateToPeer );
     tr_free( peer->client );
     tr_free( peer );
@@ -826 +835 @@
             break;
 
-        case TR_PEERMSG_PEER_PROGRESS: { /* if we're both seeds, then disconnect. */
-#if 0
-            const int clientIsSeed = tr_cpGetStatus( t->tor->completion ) != TR_CP_INCOMPLETE;
+        case TR_PEERMSG_PEER_PROGRESS: {
+            struct peer_atom * atom = getExistingAtom( t, &peer->in_addr );
             const int peerIsSeed = e->progress >= 1.0;
-            if( clientIsSeed && peerIsSeed )
-                peer->doPurge = 1;
-#endif
+            if( peerIsSeed )
+                atom->flags |= ADDED_F_SEED_FLAG;
+            else
+                atom->flags &= ~ADDED_F_SEED_FLAG;
             break;
         }
@@ -1096 +1105 @@
 
         walk->flags = 0;
-        if( peerPrefersCrypto(peer) )  walk->flags |= 1;
-        if( peer->progress >= 1.0 )    walk->flags |= 2;
+        if( peerPrefersCrypto(peer) )  walk->flags |= ADDED_F_ENCRYPTION_FLAG;
+        if( peer->progress >= 1.0 )    walk->flags |= ADDED_F_SEED_FLAG;
     }
 
@@ -1296 +1305 @@
         ++setmePeersFrom[atom->from];
 
-        if( tr_peerIoGetRateToPeer( peer->io ) > 0.01 )
+        if( tr_rcRate( peer->rateToPeer ) > 0.01 )
             ++*setmePeersGettingFromUs;
 
-        if( tr_peerIoGetRateToClient( peer->io ) > 0.01 )
+        if( tr_rcRate( peer->rateToClient ) > 0.01 )
             ++*setmePeersSendingToUs;
     }
@@ -1336 +1345 @@
         stat->progress         = peer->progress;
         stat->isEncrypted      = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
-        stat->uploadToRate     = tr_peerIoGetRateToPeer( peer->io );
-        stat->downloadFromRate = tr_peerIoGetRateToClient( peer->io );
+        stat->uploadToRate     = tr_rcRate( peer->rateToPeer );
+        stat->downloadFromRate = tr_rcRate( peer->rateToClient );
         stat->isDownloading    = stat->uploadToRate > 0.01;
         stat->isUploading      = stat->downloadFromRate > 0.01;
@@ -1417 +1426 @@
         node->preferred = peer->peerIsInterested && !clientIsSnubbedBy(peer);
         node->randomKey = tr_rand( INT_MAX );
-        node->rate = tr_peerIoGetRateToClient( peer->io );
+        node->rate = (3*tr_rcRate(peer->rateToPeer))
+                   + (1*tr_rcRate(peer->rateToClient));
     }
 
@@ -1516 +1526 @@
         const int peerIsSeed = peer->progress >= 1.0;
         const struct peer_atom * atom = getExistingAtom( t, &peer->in_addr );
-        const double throughput = (2*tr_peerIoGetRateToPeer( peer->io ))
-                                + tr_peerIoGetRateToClient( peer->io );
+        const double throughput = (3*tr_rcRate(peer->rateToPeer))
+                                + (1*tr_rcRate(peer->rateToClient));
 
         assert( atom != NULL );
@@ -1580 +1590 @@
 
         /* no need to connect if we're both seeds... */
-        if( seed && ( atom->flags & 2 ) ) {
+        if( seed && (atom->flags & ADDED_F_SEED_FLAG) ) {
             fprintf( stderr, "RECONNECT peer %d (%s) is a seed and so are we...\n", i, tr_peerIoAddrStr(&atom->addr,atom->port) );
             continue;

trunk/libtransmission/peer-msgs.c

@@ -489 +489 @@
         return TR_ADDREQ_MISSING;
 
-    maxSize = MIN( 2 + (int)(tr_peerIoGetRateToClient(msgs->io)/10), 100 );
-    //if( ( time(NULL) - msgs->lastReqAddedAt <= 5 ) && ( tr_list_size( msgs->clientAskedFor) >= maxSize ) )
+    maxSize = MIN( 3 + (int)(tr_rcRate(msgs->info->rateToClient)/10), 100 );
     if( tr_list_size( msgs->clientAskedFor) >= maxSize )
         return TR_ADDREQ_FULL;
@@ -966 +965 @@
     tor->activityDate = tr_date( );
     tor->downloadedCur += byteCount;
+    tr_rcTransferred( msgs->info->rateToClient, byteCount );
     tr_rcTransferred( tor->download, byteCount );
     tr_rcTransferred( tor->handle->download, byteCount );
@@ -976 +976 @@
     tor->activityDate = tr_date( );
     tor->uploadedCur += byteCount;
+    tr_rcTransferred( msgs->info->rateToPeer, byteCount );
     tr_rcTransferred( tor->upload, byteCount );
     tr_rcTransferred( tor->handle->upload, byteCount );