Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / fio-ini.c

diff --git a/fio-ini.c b/fio-ini.c
index ff121cba83e5e580db93bc632a0d947be34f8fe6..73cebf220d5f761c6797993b402a556f4af0ca27 100644 (file)
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -36,6 +36,9 @@
 #define DEF_FILE_SIZE          (1024 * 1024 * 1024UL)
 #define DEF_ZONE_SIZE          (0)
 #define DEF_ZONE_SKIP          (0)
+#define DEF_RWMIX_CYCLE                (500)
+#define DEF_RWMIX_READ         (50)
+#define DEF_NICE               (0)
 
 static char fio_version_string[] = "fio 1.3";
 
@@ -165,7 +168,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 +252,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 +272,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;
@@ -277,16 +285,16 @@ err:
 
 int init_random_state(struct thread_data *td)
 {
-       unsigned long seed;
+       unsigned long seeds[4];
        int fd, num_maps, blocks;
 
-       fd = open("/dev/random", O_RDONLY);
+       fd = open("/dev/urandom", O_RDONLY);
        if (fd == -1) {
                td_verror(td, errno);
                return 1;
        }
 
-       if (read(fd, &seed, sizeof(seed)) < (int) sizeof(seed)) {
+       if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
                td_verror(td, EIO);
                close(fd);
                return 1;
@@ -294,14 +302,15 @@ int init_random_state(struct thread_data *td)
 
        close(fd);
 
-       srand48_r(seed, &td->bsrange_state);
-       srand48_r(seed, &td->verify_state);
+       srand48_r(seeds[0], &td->bsrange_state);
+       srand48_r(seeds[1], &td->verify_state);
+       srand48_r(seeds[2], &td->rwmix_state);
 
        if (td->sequential)
                return 0;
 
        if (repeatable)
-               seed = DEF_RANDSEED;
+               seeds[3] = DEF_RANDSEED;
 
        blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
        num_maps = blocks / BLOCKS_PER_MAP;
@@ -309,7 +318,7 @@ int init_random_state(struct thread_data *td)
        td->num_maps = num_maps;
        memset(td->file_map, 0, num_maps * sizeof(long));
 
-       srand48_r(seed, &td->random_state);
+       srand48_r(seeds[3], &td->random_state);
        return 0;
 }
 
@@ -397,8 +406,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 +426,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 +466,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;
 
@@ -487,6 +507,9 @@ static int check_int(char *p, char *name, unsigned int *val)
 {
        char *str;
 
+       if (strncmp(p, name, strlen(name)))
+               return 1;
+
        str = strstr(p, name);
        if (!str)
                return 1;
@@ -626,13 +649,12 @@ 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;
 }
 
 int parse_jobs_ini(char *file)
 {
-       unsigned int prioclass, prio, cpu, global;
+       unsigned int prioclass, prio, cpu, global, il;
        unsigned long long ull;
        unsigned long ul1, ul2;
        struct thread_data *td;
@@ -670,6 +692,7 @@ int parse_jobs_ini(char *file)
                                continue;
                        if (strstr(p, "["))
                                break;
+                       strip_blank_front(&p);
                        strip_blank_end(p);
 
                        if (!check_int(p, "prio", &prio)) {
@@ -772,6 +795,28 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
+                       if (!check_int(p, "rwmixcycle", &td->rwmixcycle)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }
+                       if (!check_int(p, "rwmixread", &il)) {
+                               if (il > 100)
+                                       il = 100;
+                               td->rwmixread = il;
+                               fgetpos(f, &off);
+                               continue;
+                       }
+                       if (!check_int(p, "rwmixwrite", &il)) {
+                               if (il > 100)
+                                       il = 100;
+                               td->rwmixread = 100 - il;
+                               fgetpos(f, &off);
+                               continue;
+                       }
+                       if (!check_int(p, "nice", &td->nice)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }
                        if (!check_range(p, "bsrange", &ul1, &ul2)) {
                                if (ul1 > ul2) {
                                        td->max_bs = ul1;
@@ -849,7 +894,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;
                        }
@@ -859,7 +913,7 @@ int parse_jobs_ini(char *file)
                }
                fsetpos(f, &off);
 
-               if (add_job(td, name))
+               if (add_job(td, name, 0))
                        return 1;
        }
 
@@ -905,6 +959,9 @@ static int fill_def_thread(void)
        def_thread.stonewall = DEF_STONEWALL;
        def_thread.numjobs = DEF_NUMJOBS;
        def_thread.use_thread = DEF_USE_THREAD;
+       def_thread.rwmixcycle = DEF_RWMIX_CYCLE;
+       def_thread.rwmixread = DEF_RWMIX_READ;
+       def_thread.nice = DEF_NICE;
 #ifdef FIO_HAVE_DISK_UTIL
        def_thread.do_disk_util = 1;
 #endif