X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=689c495b6ac648059a513c325d92620b7bd82beb;hb=75e6f36fae06978f29296fce76a7f00ca0df7b56;hp=2cfa6d286544421dfd033bd9fecdb94890fa3d0b;hpb=16b462aeb47996111ee6aa516c9226708db7c248;p=fio.git diff --git a/init.c b/init.c index 2cfa6d28..689c495b 100644 --- a/init.c +++ b/init.c @@ -51,6 +51,7 @@ #define DEF_UNLINK (0) #define DEF_WRITE_BW_LOG (0) #define DEF_WRITE_LAT_LOG (0) +#define DEF_NO_RAND_MAP (0) #define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var) @@ -137,8 +138,18 @@ 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]), + }, + { + .name = "read_bs", + .type = FIO_OPT_STR_VAL_INT, + .off1 = td_var_offset(bs[DDIR_READ]), + }, + { + .name = "write_bs", + .type = FIO_OPT_STR_VAL_INT, + .off1 = td_var_offset(bs[DDIR_WRITE]), }, { .name = "offset", @@ -163,8 +174,20 @@ 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]), + }, + { + .name = "read_bsrange", + .type = FIO_OPT_RANGE, + .off1 = td_var_offset(min_bs[DDIR_READ]), + .off2 = td_var_offset(max_bs[DDIR_READ]), + }, + { + .name = "write_bsrange", + .type = FIO_OPT_RANGE, + .off1 = td_var_offset(min_bs[DDIR_WRITE]), + .off2 = td_var_offset(max_bs[DDIR_WRITE]), }, { .name = "nrfiles", @@ -342,6 +365,16 @@ static struct fio_option options[] = { .type = FIO_OPT_STR_SET, .off1 = td_var_offset(write_lat_log), }, + { + .name = "norandommap", + .type = FIO_OPT_STR_SET, + .off1 = td_var_offset(norandommap), + }, + { + .name = "bs_unaligned", + .type = FIO_OPT_STR_SET, + .off1 = td_var_offset(bs_unaligned), + }, { .name = NULL, }, @@ -473,12 +506,28 @@ 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->bs[DDIR_READ] != DEF_BS) + td->bs[DDIR_WRITE] = td->bs[DDIR_READ]; + 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; + + if (td->norandommap && td->verify != VERIFY_NONE) { + log_err("fio: norandommap given, verify disabled\n"); + td->verify = VERIFY_NONE; + } + if (td->bs_unaligned && (td->odirect || td->io_ops->flags & FIO_RAWIO)) + log_err("fio: bs_unaligned may not work with raw io\n"); } /* @@ -524,6 +573,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) } } + if (td->odirect) + td->io_ops->flags |= FIO_RAWIO; + fixup_options(td); td->filetype = FIO_TYPE_FILE; @@ -534,9 +586,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->filetype = FIO_TYPE_CHAR; } - if (td->odirect) - td->io_ops->flags |= FIO_RAWIO; - if (td->filename) td->nr_uniq_files = 1; else @@ -608,7 +657,7 @@ static int add_job(struct thread_data *td, const char *jobname, int 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); + fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d/%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs[DDIR_READ], td->max_bs[DDIR_READ], td->min_bs[DDIR_WRITE], td->max_bs[DDIR_WRITE], td->rate, td->io_ops->name, td->iodepth); } else if (job_add_num == 1) fprintf(f_out, "...\n"); } @@ -674,12 +723,14 @@ int init_random_state(struct thread_data *td) if (td->rand_repeatable) seeds[3] = DEF_RANDSEED; - for_each_file(td, f, i) { - blocks = (f->file_size + td->min_bs - 1) / td->min_bs; - num_maps = blocks / 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)); + if (!td->norandommap) { + for_each_file(td, f, i) { + 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)); + } } os_random_seed(seeds[3], &td->random_state); @@ -843,7 +894,7 @@ int parse_jobs_ini(char *file, int stonewall_flag) { unsigned int global; struct thread_data *td; - char *string, *name, *tmpbuf; + char *string, *name; fpos_t off; FILE *f; char *p; @@ -857,15 +908,16 @@ int parse_jobs_ini(char *file, int stonewall_flag) string = malloc(4096); name = malloc(256); - tmpbuf = malloc(4096); + memset(name, 0, 256); stonewall = stonewall_flag; - while ((p = fgets(string, 4096, f)) != NULL) { - if (ret) + do { + p = fgets(string, 4095, f); + if (!p) break; if (is_empty_or_comment(p)) continue; - if (sscanf(p, "[%s]", name) != 1) + if (sscanf(p, "[%255s]", name) != 1) continue; global = !strncmp(name, "global", 6); @@ -890,10 +942,12 @@ int parse_jobs_ini(char *file, int stonewall_flag) while ((p = fgets(string, 4096, f)) != NULL) { if (is_empty_or_comment(p)) continue; - if (strstr(p, "[")) - break; strip_blank_front(&p); + + if (p[0] == '[') + break; + strip_blank_end(p); fgetpos(f, &off); @@ -903,20 +957,20 @@ int parse_jobs_ini(char *file, int stonewall_flag) * dump all the bad ones. Makes trial/error fixups * easier on the user. */ - ret = parse_option(p, options, td); + ret |= parse_option(p, options, td); } if (!ret) { fsetpos(f, &off); ret = add_job(td, name, 0); + } else { + log_err("fio: job %s dropped\n", name); + put_job(td); } - if (ret) - break; - } + } while (!ret); free(string); free(name); - free(tmpbuf); fclose(f); return ret; } @@ -935,9 +989,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; @@ -962,6 +1017,7 @@ static int fill_def_thread(void) def_thread.unlink = DEF_UNLINK; def_thread.write_bw_log = write_bw_log; def_thread.write_lat_log = write_lat_log; + def_thread.norandommap = DEF_NO_RAND_MAP; #ifdef FIO_HAVE_DISK_UTIL def_thread.do_disk_util = 1; #endif @@ -1033,7 +1089,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: @@ -1163,7 +1224,6 @@ int parse_options(int argc, char *argv[]) if (!thread_number) { log_err("No jobs defined(s)\n"); - usage(); return 1; }