Changeset 7353

Timestamp:

Dec 11, 2008, 7:04:46 AM (12 years ago)

Author:

charles

Message:

(trunk libT) fix bug which caused libtransmission to hold onto nonproductive peers for longer than it should've

Location:

trunk/libtransmission

Files:

• peer-mgr-private.h (modified) (1 diff)
• peer-mgr.c (modified) (6 diffs)
• peer-msgs.c (modified) (1 diff)

trunk/libtransmission/peer-mgr-private.h

@@ -63 +63 @@
     char                   * client;
 
-    time_t                   peerSentPieceDataAt;
     time_t                   chokeChangedAt;
-    time_t                   pieceDataActivityDate;
 
     struct tr_peermsgs     * msgs;

trunk/libtransmission/peer-mgr.c

@@ -49 +49 @@
 
     /* when many peers are available, keep idle ones this long */
-    MIN_UPLOAD_IDLE_SECS = ( 60 * 3 ),
+    MIN_UPLOAD_IDLE_SECS = ( 30 ),
 
     /* when few peers are available, keep idle ones this long */
-    MAX_UPLOAD_IDLE_SECS = ( 60 * 10 ),
+    MAX_UPLOAD_IDLE_SECS = ( 60 * 5 ),
 
     /* how frequently to decide which peers live and die */
@@ -1019 +1019 @@
             if( peer ) {
                 struct peer_atom * a = getExistingAtom( t, &peer->addr );
-                a->piece_data_time = now;
+                if( e->wasPieceData )
+                    a->piece_data_time = now;
             }
 
@@ -1057 +1058 @@
             if( peer ) {
                 struct peer_atom * a = getExistingAtom( t, &peer->addr );
-                a->piece_data_time = now;
+                if( e->wasPieceData )
+                    a->piece_data_time = now;
             }
 
@@ -1241 +1243 @@
         atom = getExistingAtom( t, addr );
         atom->time = time( NULL );
+        atom->piece_data_time = 0;
 
         if( atom->myflags & MYFLAG_BANNED )
@@ -2028 +2031 @@
         const int lo = MIN_UPLOAD_IDLE_SECS;
         const int hi = MAX_UPLOAD_IDLE_SECS;
-        const int limit = lo + ( ( hi - lo ) * strictness );
-        const time_t then = peer->pieceDataActivityDate;
-        const int idleTime = then ? ( now - then ) : 0;
+        const int limit = hi - ( ( hi - lo ) * strictness );
+        const int idleTime = now - MAX( atom->time, atom->piece_data_time );
+/*fprintf( stderr, "strictness is %.3f, limit is %d seconds... time since connect is %d, time since piece is %d ... idleTime is %d, doPurge is %d\n", (double)strictness, limit, (int)(now - atom->time), (int)(now - atom->piece_data_time), idleTime, idleTime > limit );*/
         if( idleTime > limit ) {
             tordbg( t, "purging peer %s because it's been %d secs since we shared anything",
@@ -2220 +2223 @@
             tr_peer * peer = connections[i];
             struct peer_atom * atom = getExistingAtom( t, &peer->addr );
-            if( peer->pieceDataActivityDate )
+            if( atom->piece_data_time )
                 atom->numFails = 0;
             else

trunk/libtransmission/peer-msgs.c

@@ -1670 +1670 @@
     **/
 
-    msgs->info->peerSentPieceDataAt = time( NULL );
     if(( err = tr_ioWrite( tor, req->index, req->offset, req->length, data )))
         return err;