Changeset 5287

Timestamp:

Mar 18, 2008, 5:46:29 PM (15 years ago)

Author:

charles

Message:

#781: (1) fix overreporting corrupt data, and (2) fix bug added in r5172 that didn't handle sent request TTL correctly, causing too many dupliate block requests.

File:

• trunk/libtransmission/peer-msgs.c (modified) (6 diffs)

trunk/libtransmission/peer-msgs.c

@@ -79 +79 @@
     MAX_FAST_ALLOWED_THRESHOLD = 10,
 
+    /* how long an unsent request can stay queued before it's returned
+       back to the peer-mgr's pool of requests */
     QUEUED_REQUEST_TTL_SECS = 20,
 
-    SENT_REQUEST_TTL_SECS = 90
+    /* how long a sent request can stay queued before it's returned
+       back to the peer-mgr's pool of requests */
+    SENT_REQUEST_TTL_SECS = 120
 };
 
@@ -145 +149 @@
 
 static void
+reqListCopy( struct request_list * dest, const struct request_list * src )
+{
+    dest->count = src->count;
+    dest->max = src->max;
+    dest->requests = tr_new( struct peer_request, dest->max );
+    memcpy( dest->requests, src->requests, sizeof( struct peer_request ) * dest->count );
+}
+
+static void
 reqListRemoveOne( struct request_list * list, int i )
 {
@@ -203 +216 @@
 
     return err;
-}
-
-static void
-reqListPrune( struct request_list * list,
-              struct request_list * pruned,
-              time_t                cutoff )
-{
-    int i, k=0, p=0;
-    struct peer_request keep[MAX_QUEUE_SIZE];
-    struct peer_request prune[MAX_QUEUE_SIZE];
-
-    for( i=0; i<list->count; ++i ) {
-        const struct peer_request * req = list->requests + i;
-        if( req->time_requested > cutoff )
-            keep[k++] = *req;
-        else
-            prune[p++] = *req;
-    }
-
-    memcpy( list->requests, keep, sizeof(struct peer_request) * k );
-    list->count = k;
-
-    reqListReserve( pruned, pruned->count + p );
-    memcpy( pruned->requests + pruned->count,
-            prune,
-            sizeof(struct peer_request) * p );
-    pruned->count += p;
 }
 
@@ -686 +672 @@
 {
     int i;
-    const time_t now = time( NULL );
-    const time_t queued_cutoff = now - QUEUED_REQUEST_TTL_SECS;
-    const time_t sent_cutoff   = now - SENT_REQUEST_TTL_SECS;
-    struct request_list pruned = REQUEST_LIST_INIT;
-
-    reqListPrune( &msgs->clientWillAskFor, &pruned, queued_cutoff );
-    reqListPrune( &msgs->clientAskedFor, &pruned, sent_cutoff );
-
-    /* expire the old requests */
-    for( i=0; i<pruned.count; ++i ) {
-        const struct peer_request * req = &pruned.requests[i];
-        tr_peerMsgsCancel( msgs, req->index, req->offset, req->length );
-    }
-
-    /* cleanup */
-    reqListClear( &pruned );
+    time_t oldestAllowed;
+    struct request_list tmp = REQUEST_LIST_INIT;
+
+    /* cancel requests that have been queued for too long */
+    oldestAllowed = time( NULL ) - QUEUED_REQUEST_TTL_SECS;
+    reqListCopy( &tmp, &msgs->clientWillAskFor );
+    for( i=0; i<tmp.count; ++i ) {
+        const struct peer_request * req = &tmp.requests[i];
+        if( req->time_requested < oldestAllowed )
+            tr_peerMsgsCancel( msgs, req->index, req->offset, req->length );
+    }
+    reqListClear( &tmp );
+
+    /* cancel requests that were sent too long ago */
+    oldestAllowed = time( NULL ) - SENT_REQUEST_TTL_SECS;
+    reqListCopy( &tmp, &msgs->clientAskedFor );
+    for( i=0; i<tmp.count; ++i ) {
+        const struct peer_request * req = &tmp.requests[i];
+        if( req->time_requested < oldestAllowed )
+            tr_peerMsgsCancel( msgs, req->index, req->offset, req->length );
+    }
+    reqListClear( &tmp );
 }
 
@@ -1432 +1424 @@
 
 static void
+decrementDownloadedCount( tr_peermsgs * msgs, uint32_t byteCount )
+{
+    tr_torrent * tor = msgs->torrent;
+    tor->downloadedCur -= MIN( tor->downloadedCur, byteCount );
+}
+
+static void
 reassignBytesToCorrupt( tr_peermsgs * msgs, uint32_t byteCount )
 {
     tr_torrent * tor = msgs->torrent;
 
-    /* increment the `corrupt' field */
     tor->corruptCur += byteCount;
 
-    /* decrement the `downloaded' field */
-    tor->downloadedCur -= MIN( tor->downloadedCur, byteCount );
-}
-
+    decrementDownloadedCount( msgs, byteCount );
+}
 
 static void
@@ -1455 +1451 @@
 clientGotUnwantedBlock( tr_peermsgs * msgs, const struct peer_request * req )
 {
-    reassignBytesToCorrupt( msgs, req->length );
+    decrementDownloadedCount( msgs, req->length );
 }