[PATCH] Add write_iolog support

[fio.git] / fio-ini.c

diff --git a/fio-ini.c b/fio-ini.c
index 6f866dfbc7c2d0fff58bab94c6a6fbe1538b98ba..d51503519ff709875ebb56cb210a671ad118de59 100644 (file)
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -165,7 +165,7 @@ static void put_job(struct thread_data *td)
        thread_number--;
 }
 
-static int add_job(struct thread_data *td, const char *jobname)
+static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
        char *ddir_str[] = { "read", "write", "randread", "randwrite",
                             "rw", NULL, "randrw" };
@@ -249,7 +249,11 @@ static int add_job(struct thread_data *td, const char *jobname)
                setup_log(&td->bw_log);
 
        ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
-       printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+
+       if (!job_add_num)
+               printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, 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)
+               printf("...\n");
 
        /*
         * recurse add identical jobs, clear numjobs and stonewall options
@@ -265,8 +269,9 @@ static int add_job(struct thread_data *td, const char *jobname)
                td_new->numjobs = 1;
                td_new->stonewall = 0;
                td_new->jobnum = numjobs;
+               job_add_num = numjobs - 1;
 
-               if (add_job(td_new, jobname))
+               if (add_job(td_new, jobname, job_add_num))
                        goto err;
        }
        return 0;
@@ -397,8 +402,12 @@ typedef int (str_cb_fn)(struct thread_data *, char *);
 
 static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td)
 {
-       char *s = strstr(p, name);
+       char *s;
+
+       if (strncmp(p, name, strlen(name)))
+               return 1;
 
+       s = strstr(p, name);
        if (!s)
                return 1;
 
@@ -413,8 +422,12 @@ static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td)
 
 static int check_strstore(char *p, char *name, char *dest)
 {
-       char *s = strstr(p, name);
+       char *s;
+
+       if (strncmp(p, name, strlen(name)))
+               return 1;
 
+       s = strstr(p, name);
        if (!s)
                return 1;
 
@@ -449,6 +462,9 @@ static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
        char option[128];
        char *str, *p1, *p2;
 
+       if (strncmp(p, name, strlen(name)))
+               return 1;
+
        strcpy(option, p);
        p = option;
 
@@ -629,7 +645,6 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 static int str_iolog_cb(struct thread_data *td, char *file)
 {
        strncpy(td->iolog_file, file, sizeof(td->iolog_file) - 1);
-
        return 0;
 }
 
@@ -853,7 +868,16 @@ int parse_jobs_ini(char *file)
                                continue;
                        }
                        if (!check_str(p, "iolog", str_iolog_cb, td)) {
-                               td->iolog = 1;
+                               printf("got read iolog\n");
+                               td->read_iolog = 1;
+                               td->write_iolog = 0;
+                               fgetpos(f, &off);
+                               continue;
+                       }
+                       if (!td->read_iolog &&
+                           !check_str(p, "write_iolog", str_iolog_cb, td)) {
+                               printf("got write iolog\n");
+                               td->write_iolog = 1;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -863,7 +887,7 @@ int parse_jobs_ini(char *file)
                }
                fsetpos(f, &off);
 
-               if (add_job(td, name))
+               if (add_job(td, name, 0))
                        return 1;
        }