projects / fio.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[PATCH] Print pretty bs values
[fio.git] / init.c
diff --git a/init.c b/init.c
index 6ad3c64c4221124d779ae982ac3b96ee12ced5bc..37cf050894099ba5be67fccfc9b194c53201b56c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -60,8 +60,10 @@ static int str_ioengine_cb(void *, const char *);
 static int str_mem_cb(void *, const char *);
 static int str_verify_cb(void *, const char *);
 static int str_lockmem_cb(void *, unsigned long *);
+#ifdef FIO_HAVE_IOPRIO
 static int str_prio_cb(void *, unsigned int *);
 static int str_prioclass_cb(void *, unsigned int *);
+#endif
 static int str_exitall_cb(void);
 static int str_cpumask_cb(void *, unsigned int *);
 
@@ -138,8 +140,9 @@ static struct fio_option options[] = {
        },
        {
                .name   = "bs",
-               .type   = FIO_OPT_STR_VAL,
-               .off1   = td_var_offset(bs),
+               .type   = FIO_OPT_STR_VAL_INT,
+               .off1   = td_var_offset(bs[DDIR_READ]),
+               .off2   = td_var_offset(bs[DDIR_WRITE]),
        },
        {
                .name   = "offset",
@@ -164,8 +167,10 @@ static struct fio_option options[] = {
        {
                .name   = "bsrange",
                .type   = FIO_OPT_RANGE,
-               .off1   = td_var_offset(min_bs),
-               .off2   = td_var_offset(max_bs),
+               .off1   = td_var_offset(min_bs[DDIR_READ]),
+               .off2   = td_var_offset(max_bs[DDIR_READ]),
+               .off3   = td_var_offset(min_bs[DDIR_WRITE]),
+               .off4   = td_var_offset(max_bs[DDIR_WRITE]),
        },
        {
                .name   = "nrfiles",
@@ -484,10 +489,17 @@ static void fixup_options(struct thread_data *td)
        if (td_read(td) || td_rw(td))
                td->overwrite = 1;
 
-       if (!td->min_bs)
-               td->min_bs = td->bs;
-       if (!td->max_bs)
-               td->max_bs = td->bs;
+       if (!td->min_bs[DDIR_READ])
+               td->min_bs[DDIR_READ]= td->bs[DDIR_READ];
+       if (!td->max_bs[DDIR_READ])
+               td->max_bs[DDIR_READ] = td->bs[DDIR_READ];
+       if (!td->min_bs[DDIR_WRITE])
+               td->min_bs[DDIR_WRITE]= td->bs[DDIR_WRITE];
+       if (!td->max_bs[DDIR_WRITE])
+               td->max_bs[DDIR_WRITE] = td->bs[DDIR_WRITE];
+
+       td->rw_min_bs = min(td->min_bs[DDIR_READ], td->min_bs[DDIR_WRITE]);
+
        if (td_read(td) && !td_rw(td))
                td->verify = 0;
 
@@ -499,6 +511,27 @@ static void fixup_options(struct thread_data *td)
                log_err("fio: bs_unaligned may not work with raw io\n");
 }
 
+/*
+ * This function leaks the buffer
+ */
+static char *to_kmg(unsigned int val)
+{
+       char *buf = malloc(32);
+       char post[] = { 0, 'K', 'G', 'P', -1 };
+       char *p = post;
+
+       while (*p != -1) {
+               if (val & 1023)
+                       break;
+
+               val >>= 10;
+               p++;
+       }
+
+       snprintf(buf, 31, "%u%c", val, *p);
+       return buf;
+}
+
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -512,19 +545,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        int numjobs, ddir, i;
        struct fio_file *f;
 
-#ifndef FIO_HAVE_LIBAIO
-       if (td->io_engine == FIO_LIBAIO) {
-               log_err("Linux libaio not available\n");
-               return 1;
-       }
-#endif
-#ifndef FIO_HAVE_POSIXAIO
-       if (td->io_engine == FIO_POSIXAIO) {
-               log_err("posix aio not available\n");
-               return 1;
-       }
-#endif
-
        /*
         * the def_thread is just for options, it's not a real job
         */
@@ -625,8 +645,21 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                if (!job_add_num) {
                        if (td->io_ops->flags & 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_ops->name, td->iodepth);
+                       else {
+                               char *c1, *c2, *c3, *c4;
+
+                               c1 = to_kmg(td->min_bs[DDIR_READ]);
+                               c2 = to_kmg(td->max_bs[DDIR_READ]);
+                               c3 = to_kmg(td->min_bs[DDIR_WRITE]);
+                               c4 = to_kmg(td->max_bs[DDIR_WRITE]);
+
+                               fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%s-%s/%s-%s, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
+
+                               free(c1);
+                               free(c2);
+                               free(c3);
+                               free(c4);
+                       }
                } else if (job_add_num == 1)
                        fprintf(f_out, "...\n");
        }
@@ -694,8 +727,8 @@ int init_random_state(struct thread_data *td)
 
        if (!td->norandommap) {
                for_each_file(td, f, i) {
-                       blocks = (f->file_size + td->min_bs - 1) / td->min_bs;
-                       num_maps = blocks / BLOCKS_PER_MAP;
+                       blocks = (f->file_size + td->rw_min_bs - 1) / td->rw_min_bs;
+                       num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
                        f->file_map = malloc(num_maps * sizeof(long));
                        f->num_maps = num_maps;
                        memset(f->file_map, 0, num_maps * sizeof(long));
@@ -826,6 +859,7 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
        return 0;
 }
 
+#ifdef FIO_HAVE_IOPRIO
 static int str_prioclass_cb(void *data, unsigned int *val)
 {
        struct thread_data *td = data;
@@ -841,6 +875,7 @@ static int str_prio_cb(void *data, unsigned int *val)
        td->ioprio |= *val;
        return 0;
 }
+#endif
 
 static int str_exitall_cb(void)
 {
@@ -932,6 +967,9 @@ int parse_jobs_ini(char *file, int stonewall_flag)
                if (!ret) {
                        fsetpos(f, &off);
                        ret = add_job(td, name, 0);
+               } else {
+                       log_err("fio: job %s dropped\n", name);
+                       put_job(td);
                }
        } while (!ret);
 
@@ -955,9 +993,10 @@ static int fill_def_thread(void)
         */
        def_thread.ddir = DDIR_READ;
        def_thread.iomix = 0;
-       def_thread.bs = DEF_BS;
-       def_thread.min_bs = 0;
-       def_thread.max_bs = 0;
+       def_thread.bs[DDIR_READ] = DEF_BS;
+       def_thread.bs[DDIR_WRITE] = DEF_BS;
+       def_thread.min_bs[DDIR_READ] = def_thread.min_bs[DDIR_WRITE] = 0;
+       def_thread.max_bs[DDIR_READ] = def_thread.max_bs[DDIR_WRITE] = 0;
        def_thread.odirect = DEF_ODIRECT;
        def_thread.ratecycle = DEF_RATE_CYCLE;
        def_thread.sequential = DEF_SEQUENTIAL;
@@ -1054,7 +1093,12 @@ static int parse_cmd_line(int argc, char *argv[])
                                        return 0;
                        }
 
-                       parse_cmd_option(opt, val, options, td);
+                       ret = parse_cmd_option(opt, val, options, td);
+                       if (ret) {
+                               log_err("fio: job dropped\n");
+                               put_job(td);
+                               td = NULL;
+                       }
                        break;
                }
                default:
@@ -1184,7 +1228,6 @@ int parse_options(int argc, char *argv[])
 
        if (!thread_number) {
                log_err("No jobs defined(s)\n");
-               usage();
                return 1;
        }
 
fio - Flexible IO Tester