Ticket #2551: prefetch-forgotten.patch

libtransmission/peer-msgs.c

@@ -1113 +1113 @@
 }
 
 static void
+prefetchPieces( tr_peermsgs *msgs )
+{
+    int i;
+    uint64_t next = 0;
+
+    /* Maintain at least 8 prefetched blocks per unchoked peer, but allow
+       up to 4 extra blocks if that would cause sequential writes. */
+    for( i=msgs->prefetchCount; i<msgs->peerAskedForCount; ++i )
+    {
+        const struct peer_request * req = msgs->peerAskedFor + i;
+        const uint64_t begin = tr_pieceOffset( msgs->torrent, req->index, req->offset, 0 );
+        const uint64_t end = begin + req->length;
+        const tr_bool isSequential = next == begin;
+
+        if( ( i >= 12 ) || ( !isSequential && ( i >= 8 ) ) )
+            break;
+
+        tr_ioPrefetch( msgs->torrent, req->index, req->offset, req->length );
+        ++msgs->prefetchCount;
+
+        next = end;
+    }
+}
+
+static void
 peerMadeRequest( tr_peermsgs *               msgs,
                  const struct peer_request * req )
 {
@@ -1134 +1159 @@
     else
         allow = TRUE;
 
-    if( allow )
+    if( allow ) {
         msgs->peerAskedFor[msgs->peerAskedForCount++] = *req;
-    else if( fext )
+        prefetchPieces( msgs );         
+    } else if( fext )
         protocolSendReject( msgs, req );
 }
 
@@ -1633 +1659 @@
     }
 }
 
-static void
-prefetchPieces( tr_peermsgs *msgs )
-{
-    int i;
-    uint64_t next = 0;
-
-    /* Maintain at least 8 prefetched blocks per unchoked peer, but allow
-       up to 4 extra blocks if that would cause sequential writes. */
-    for( i=msgs->prefetchCount; i<msgs->peerAskedForCount; ++i )
-    {
-        const struct peer_request * req = msgs->peerAskedFor + i;
-        const uint64_t begin = tr_pieceOffset( msgs->torrent, req->index, req->offset, 0 );
-        const uint64_t end = begin + req->length;
-        const tr_bool isSequential = next == begin;
-
-        if( ( i >= 12 ) || ( !isSequential && ( i >= 8 ) ) )
-            break;
-
-        tr_ioPrefetch( msgs->torrent, req->index, req->offset, req->length );
-        ++msgs->prefetchCount;
-
-        next = end;
-    }
-}
-
 static size_t
 fillOutputBuffer( tr_peermsgs * msgs, time_t now )
 {