X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio-ini.c;h=540902fee58d1e3ad51e165c18a983fd314f26fe;hp=b360e9715ba169b215a6f2cd31115415c6a75fb5;hb=4ae3f76333bf2382e516db0b5c202b8982b1170f;hpb=4785f99523f5c69635eb4bd826f25cd2e264cda7 diff --git a/fio-ini.c b/fio-ini.c index b360e971..540902fe 100644 --- a/fio-ini.c +++ b/fio-ini.c @@ -81,11 +81,11 @@ static void setup_log(struct io_log **log) void finish_log(struct thread_data *td, struct io_log *log, const char *name) { - char file_name[128]; + char file_name[256]; FILE *f; unsigned int i; - sprintf(file_name, "client%d_%s.log", td->thread_number, name); + snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name); f = fopen(file_name, "w"); if (!f) { perror("fopen log"); @@ -110,7 +110,10 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) return NULL; td = &threads[thread_number++]; - memset(td, 0, sizeof(*td)); + if (parent) + *td = *parent; + else + memset(td, 0, sizeof(*td)); td->fd = -1; td->thread_number = thread_number; @@ -161,8 +164,7 @@ static void put_job(struct thread_data *td) thread_number--; } -static int add_job(struct thread_data *td, const char *jobname, int prioclass, - int prio) +static int add_job(struct thread_data *td, const char *jobname) { char *ddir_str[] = { "read", "write", "randread", "randwrite", "rw", NULL, "randrw" }; @@ -181,9 +183,6 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass, return 1; } #endif -#ifdef FIO_HAVE_IOPRIO - td->ioprio = (prioclass << IOPRIO_CLASS_SHIFT) | prio; -#endif /* * the def_thread is just for options, it's not a real job @@ -218,7 +217,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass, else sprintf(td->file_name, "%s.%d", jobname, td->jobnum); } else - strcpy(td->file_name, jobname); + strncpy(td->file_name, jobname, sizeof(td->file_name) - 1); sem_init(&td->mutex, 0, 0); @@ -249,7 +248,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass, setup_log(&td->bw_log); ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2); - printf("Client%d (g=%d): rw=%s, prio=%d/%d, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], prioclass, prio, td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth); + 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); /* * recurse add identical jobs, clear numjobs and stonewall options @@ -266,7 +265,7 @@ static int add_job(struct thread_data *td, const char *jobname, int prioclass, td_new->stonewall = 0; td_new->jobnum = numjobs; - if (add_job(td_new, jobname, prioclass, prio)) + if (add_job(td_new, jobname)) goto err; } return 0; @@ -379,16 +378,18 @@ static void strip_blank_front(char **p) { char *s = *p; - while (isblank(*s)) + while (isspace(*s)) s++; } static void strip_blank_end(char *p) { - while (isblank(*p)) { - *p = '\0'; - p--; - } + char *s = p + strlen(p) - 1; + + while (isspace(*s) || iscntrl(*s)) + s--; + + *(s + 1) = '\0'; } typedef int (str_cb_fn)(struct thread_data *, char *); @@ -424,9 +425,6 @@ static int check_strstore(char *p, char *name, char *dest) strip_blank_front(&s); strcpy(dest, s); - - s = dest + strlen(dest) - 1; - strip_blank_end(s); return 0; } @@ -614,12 +612,22 @@ static int str_ioengine_cb(struct thread_data *td, char *str) strcpy(td->io_engine_name, "sgio"); td->io_engine = FIO_SGIO; return 0; + } else if (!strncmp(str, "splice", 6)) { + strcpy(td->io_engine_name, "splice"); + td->io_engine = FIO_SPLICEIO; + return 0; } fprintf(stderr, "bad ioengine type: %s\n", str); return 1; } +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) { @@ -634,7 +642,7 @@ int parse_jobs_ini(char *file) f = fopen(file, "r"); if (!f) { - perror("fopen"); + perror("fopen job file"); return 1; } @@ -655,20 +663,20 @@ int parse_jobs_ini(char *file) if (!td) return 1; - prioclass = 2; - prio = 4; - fgetpos(f, &off); while ((p = fgets(string, 4096, f)) != NULL) { if (is_empty_or_comment(p)) continue; if (strstr(p, "[")) break; + strip_blank_end(p); + if (!check_int(p, "prio", &prio)) { #ifndef FIO_HAVE_IOPRIO fprintf(stderr, "io priorities not available\n"); return 1; #endif + td->ioprio |= prio; fgetpos(f, &off); continue; } @@ -677,6 +685,7 @@ int parse_jobs_ini(char *file) fprintf(stderr, "io priorities not available\n"); return 1; #endif + td->ioprio |= prioclass << IOPRIO_CLASS_SHIFT; fgetpos(f, &off); continue; } @@ -711,6 +720,7 @@ int parse_jobs_ini(char *file) } if (!check_int(p, "fsync", &td->fsync_blocks)) { fgetpos(f, &off); + td->end_fsync = 1; continue; } if (!check_int(p, "startdelay", &td->start_delay)) { @@ -745,6 +755,10 @@ int parse_jobs_ini(char *file) fgetpos(f, &off); continue; } + if (!check_int(p, "end_fsync", &td->end_fsync)) { + fgetpos(f, &off); + continue; + } if (!check_int(p, "loops", &td->loops)) { fgetpos(f, &off); continue; @@ -829,12 +843,18 @@ int parse_jobs_ini(char *file) fgetpos(f, &off); continue; } + if (!check_str(p, "iolog", str_iolog_cb, td)) { + td->iolog = 1; + fgetpos(f, &off); + continue; + } printf("Client%d: bad option %s\n",td->thread_number,p); + return 1; } fsetpos(f, &off); - if (add_job(td, name, prioclass, prio)) + if (add_job(td, name)) return 1; } @@ -947,6 +967,9 @@ static void parse_cmd_line(int argc, char *argv[]) exit(0); } } + + if (!ini_file && argc > 1 && argv[argc - 1][0] != '-') + ini_file = strdup(argv[argc - 1]); } static void free_shm(void) @@ -1008,8 +1031,10 @@ int parse_options(int argc, char *argv[]) return 1; } - if (parse_jobs_ini(ini_file)) + if (parse_jobs_ini(ini_file)) { + usage(argv[0]); return 1; + } return 0; }