X-Git-Url: http://git.vrable.net/?p=bluesky.git;a=blobdiff_plain;f=nfs3%2Fsynreadbench.c;h=908363fde0b99c0cbd0c215ed30de995b1f26a12;hp=64bc898a14179c6119bbac7c6fcc9b09306451f1;hb=4ad919582a62923b80e9ac9ea3159938f628016e;hpb=fe07e800dbdb79a871f7da1cfc185a982183bf65

diff --git a/nfs3/synreadbench.c b/nfs3/synreadbench.c
index 64bc898..908363f 100644
--- a/nfs3/synreadbench.c
+++ b/nfs3/synreadbench.c
@@ -312,12 +312,13 @@ static void submit_random_read(NFSConnection *nfs)
         if (read_size > (1 << 20)) {
             scale = read_size / (1 << 20);
         }
+        int filecount = bench_files->len;
         printf("Warming up file %d\n", warmup_counter);
-        if (warmup_counter >= bench_files->len * scale)
+        if (warmup_counter >= filecount * scale)
             return;
         bf = &g_array_index(bench_files, struct bench_file,
-                            warmup_counter / scale);
-        send_read_request(nfs, bf->inum, (warmup_counter % scale) << 20,
+                            warmup_counter % filecount);
+        send_read_request(nfs, bf->inum, (warmup_counter / filecount) << 20,
                           read_size > (1 << 20) ? (1 << 20) : read_size);
         warmup_counter++;
         return;
@@ -443,7 +444,6 @@ int main(int argc, char *argv[])
 {
     g_thread_init(NULL);
     g_set_prgname("synclient");
-    g_print("Launching synthetic NFS RPC client...\n");
 
     bench_files = g_array_new(FALSE, TRUE, sizeof(struct bench_file));
 
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
     }
 
     main_loop = g_main_loop_new(NULL, FALSE);
-    nfs_connect("niniel.sysnet.ucsd.edu");
+    nfs_connect("vrable2.sysnet.ucsd.edu");
 
     g_main_loop_run(main_loop);