1 --- interbench.c.orig 2009-10-30 23:14:59.000000000 -0500
2 +++ interbench.c 2012-07-10 19:06:00.000000000 -0500
3 @@ -71,6 +71,7 @@ struct user_data {
11 @@ -652,6 +653,8 @@ void emulate_write(struct thread *th)
12 terminal_error("fopen");
13 if (stat(name, &statbuf) == -1)
14 terminal_fileopen_error(fp, "stat");
15 + if (statbuf.st_blksize < MIN_BLK_SIZE)
16 + statbuf.st_blksize = MIN_BLK_SIZE;
17 for (i = 0 ; i < mem; i++) {
18 if (fwrite(buf, statbuf.st_blksize, 1, fp) != 1)
19 terminal_fileopen_error(fp, "fwrite");
20 @@ -1136,14 +1139,17 @@ void get_ram(void)
21 if(!(meminfo = fopen("/proc/meminfo", "r")))
22 terminal_error("fopen");
24 - ud.ram = ud.swap = 0;
25 - while( !feof(meminfo) && !fscanf(meminfo, "MemTotal: %lu kB", &ud.ram) )
26 - fgets(aux,sizeof(aux),meminfo);
29 + while( !feof(meminfo) && !fscanf(meminfo, "MemTotal: %lu kB", &ud.ram) )
30 + fgets(aux,sizeof(aux),meminfo);
33 while( !feof(meminfo) && !fscanf(meminfo, "SwapTotal: %lu kB", &ud.swap) )
34 fgets(aux,sizeof(aux),meminfo);
35 if (fclose(meminfo) == -1)
36 terminal_error("fclose");
39 if( !ud.ram || !ud.swap ) {
41 fprintf(stderr, "\nCould not get memory or swap size. ");
42 @@ -1399,6 +1405,7 @@ void usage(void)
43 fprintf(stderr, "\t[-h]\n\n");
44 fprintf(stderr, " -l\tUse <int> loops per sec (default: use saved benchmark)\n");
45 fprintf(stderr, " -L\tUse cpu load of <int> with burn load (default: 4)\n");
46 + fprintf(stderr, " -M\tForce RAM size to <int>. Useful when disk is smaller than RAM.\n");
47 fprintf(stderr, " -t\tSeconds to run each benchmark (default: 30)\n");
48 fprintf(stderr, " -B\tNice the benchmarked thread to <int> (default: 0)\n");
49 fprintf(stderr, " -N\tNice the load thread to <int> (default: 0)\n");
50 @@ -1482,7 +1489,7 @@ int main(int argc, char **argv)
51 terminal_error("signal");
54 - while ((q = getopt(argc, argv, "hl:L:B:N:ut:bcnrC:I:m:w:x:W:X:")) != -1) {
55 + while ((q = getopt(argc, argv, "hl:L:M:B:N:ut:bcnrC:I:m:w:x:W:X:")) != -1) {
59 @@ -1496,6 +1503,9 @@ int main(int argc, char **argv)
61 ud.cpu_load = atoi(optarg);
64 + ud.ram = atoi(optarg);
67 ud.bench_nice = atoi(optarg);