[PATCH] Basic support for a cpu cycle eater job

[fio.git] / init.c

diff --git a/init.c b/init.c
index b310f6633236ac4720b4ef8f7375bcfddea5d276..1ffd6ff007d1e333a6bcd05704d10f932a86d1c9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -196,9 +196,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 
        if (!terse_output) {
-               if (!job_add_num)
-                       fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
-               else if (job_add_num == 1)
+               if (!job_add_num) {
+                       if (td->io_engine == FIO_CPUIO)
+                               fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
+                       else
+                               fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+               } else if (job_add_num == 1)
                        fprintf(f_out, "...\n");
        }
 
@@ -616,16 +619,20 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
                strcpy(td->io_engine_name, "splice");
                td->io_engine = FIO_SPLICEIO;
                return 0;
+       } else if (!strncmp(str, "cpu", 3)) {
+               strcpy(td->io_engine_name, "cpu");
+               td->io_engine = FIO_CPUIO;
+               return 0;
        }
 
-       log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
+       log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
        return 1;
 }
 
 /*
  * This is our [ini] type file parser.
  */
-int parse_jobs_ini(char *file)
+int parse_jobs_ini(char *file, int stonewall_flag)
 {
        unsigned int prioclass, prio, cpu, global, il;
        unsigned long long ull;
@@ -635,7 +642,7 @@ int parse_jobs_ini(char *file)
        fpos_t off;
        FILE *f;
        char *p;
-       int ret = 0, stonewall = 1;
+       int ret = 0, stonewall;
 
        f = fopen(file, "r");
        if (!f) {
@@ -647,6 +654,7 @@ int parse_jobs_ini(char *file)
        name = malloc(256);
        tmpbuf = malloc(4096);
 
+       stonewall = stonewall_flag;
        while ((p = fgets(string, 4096, f)) != NULL) {
                if (ret)
                        break;
@@ -725,6 +733,14 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
+                       if (!check_int(p, "cpuload", &td->cpuload)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }
+                       if (!check_int(p, "cpuchunks", &td->cpucycle)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }
                        if (!check_int(p, "thinktime", &td->thinktime)) {
                                fgetpos(f, &off);
                                continue;
@@ -749,7 +765,7 @@ int parse_jobs_ini(char *file)
                                continue;
                        }
                        if (!check_str_time(p, "timeout", &ull)) {
-                               td->timeout = ul1;
+                               td->timeout = ull;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -1024,7 +1040,6 @@ static void usage(char *name)
        printf("\t-l Generate per-job latency logs\n");
        printf("\t-w Generate per-job bandwidth logs\n");
        printf("\t-m Minimal (terse) output\n");
-       printf("\t-f Job file (Required)\n");
        printf("\t-v Print version info and exit\n");
 }
 
@@ -1032,25 +1047,19 @@ static int parse_cmd_line(int argc, char *argv[])
 {
        int c, idx = 1, ini_idx = 0;
 
-       while ((c = getopt(argc, argv, "t:o:f:lwvhm")) != EOF) {
+       while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) {
                switch (c) {
                        case 't':
                                def_timeout = atoi(optarg);
-                               idx++;
-                               break;
-                       case 'f':
-                               ini_idx++;
-                               ini_file = realloc(ini_file, ini_idx * sizeof(char *));
-                               ini_file[ini_idx - 1] = strdup(optarg);
-                               idx++;
+                               idx = optind;
                                break;
                        case 'l':
                                write_lat_log = 1;
-                               idx++;
+                               idx = optind;
                                break;
                        case 'w':
                                write_bw_log = 1;
-                               idx++;
+                               idx = optind;
                                break;
                        case 'o':
                                f_out = fopen(optarg, "w+");
@@ -1059,11 +1068,11 @@ static int parse_cmd_line(int argc, char *argv[])
                                        exit(1);
                                }
                                f_err = f_out;
-                               idx++;
+                               idx = optind;
                                break;
                        case 'm':
                                terse_output = 1;
-                               idx++;
+                               idx = optind;
                                break;
                        case 'h':
                                usage(argv[0]);
@@ -1080,7 +1089,7 @@ static int parse_cmd_line(int argc, char *argv[])
                ini_file[ini_idx - 1] = strdup(argv[idx]);
                idx++;
        }
-               
+
        if (!f_out) {
                f_out = stdout;
                f_err = stderr;
@@ -1157,7 +1166,7 @@ int parse_options(int argc, char *argv[])
        for (i = 0; i < job_files; i++) {
                if (fill_def_thread())
                        return 1;
-               if (parse_jobs_ini(ini_file[i]))
+               if (parse_jobs_ini(ini_file[i], i))
                        return 1;
                free(ini_file[i]);
        }