Changeset 10924

Timestamp:

Jul 1, 2010, 5:09:13 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #1521 "memory cache to reduce disk IO" -- improved revision from sadface

File:

• trunk/libtransmission/cache.c (modified) (3 diffs)

trunk/libtransmission/cache.c

@@ -96 +96 @@
 
 /* return the starting index of the longest contiguous run of blocks BUT:
- *   1 - Length of run must be even.
- *   2 - Run must begin with a even block.
- *   3 - Oldest run is preferred.
+ *   - Run should begin with a even block and length of run should be even.
+ *   - Oldest run is preferred.
  */
 static int
@@ -108 +107 @@
     unsigned bestlen = 1;
     unsigned jump;
-    time_t oldest_time = ~0;
+    time_t oldest_time = tr_time() + 1;
     struct run_info run;
 
@@ -122 +121 @@
         /* check alignment */
         if( len % 2 == 0 ) {
-            if( !run.is_aligned )
+            if( !run.is_aligned ) {
                 /* Let it grow. Otherwise we contribute to fragmentation */
+                if( bestlen == 1) {
+                    /* But if all other blocks are non-contiguous, we prefer this one */
+                    bestpos = pos;
+                    oldest_time = cache->maxBlocks - len;
+                }
                 continue;
+            }
         } else {
             if( len != 1 ) {