X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=95e26b8f4624fee73bf59863a52b4a7fac58d460;hp=108f2b88d1ae611f20308f8c09a8d41f7b61e5b2;hb=ff441ae84e9e02ca9877bc9cef9b529fbcb84167;hpb=792122f8434d514f04e0573e3bdf095dc2071b42 diff --git a/init.c b/init.c index 108f2b88..95e26b8f 100644 --- a/init.c +++ b/init.c @@ -65,8 +65,9 @@ int read_only = 0; int status_interval = 0; char *trigger_file = NULL; -char *trigger_cmd = NULL; long long trigger_timeout = 0; +char *trigger_cmd = NULL; +char *trigger_remote_cmd = NULL; static int prev_group_jobs; @@ -246,7 +247,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .val = 'L', }, { - .name = (char *) "trigger", + .name = (char *) "trigger-file", .has_arg = required_argument, .val = 'W', }, @@ -255,6 +256,16 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'B', }, + { + .name = (char *) "trigger", + .has_arg = required_argument, + .val = 'H', + }, + { + .name = (char *) "trigger-remote", + .has_arg = required_argument, + .val = 'J', + }, { .name = NULL, }, @@ -287,6 +298,11 @@ static void free_shm(void) free_threads_shm(); } + free(trigger_file); + free(trigger_cmd); + free(trigger_remote_cmd); + trigger_file = trigger_cmd = trigger_remote_cmd = NULL; + options_free(fio_options, &def_thread); fio_filelock_exit(); scleanup(); @@ -549,7 +565,6 @@ static int fixup_options(struct thread_data *td) if (!o->max_bs[DDIR_TRIM]) o->max_bs[DDIR_TRIM] = o->bs[DDIR_TRIM]; - o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]); o->rw_min_bs = min(o->min_bs[DDIR_TRIM], o->rw_min_bs); @@ -581,8 +596,7 @@ static int fixup_options(struct thread_data *td) if (o->norandommap && o->verify != VERIFY_NONE && !fixed_block_size(o)) { log_err("fio: norandommap given for variable block sizes, " - "verify disabled\n"); - o->verify = VERIFY_NONE; + "verify limited\n"); ret = warnings_fatal; } if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO)) @@ -743,6 +757,16 @@ static int fixup_options(struct thread_data *td) ret = 1; } + if (fio_option_is_set(o, gtod_cpu)) { + fio_gtod_init(); + fio_gtod_set_cpu(o->gtod_cpu); + fio_gtod_offload = 1; + } + + td->loops = o->loops; + if (!td->loops) + td->loops = 1; + return ret; } @@ -911,7 +935,17 @@ static void init_flags(struct thread_data *td) td->flags |= TD_F_READ_IOLOG; if (o->refill_buffers) td->flags |= TD_F_REFILL_BUFFERS; - if (o->scramble_buffers) + /* + * Always scramble buffers if asked to + */ + if (o->scramble_buffers && fio_option_is_set(o, scramble_buffers)) + td->flags |= TD_F_SCRAMBLE_BUFFERS; + /* + * But also scramble buffers, unless we were explicitly asked + * to zero them. + */ + if (o->scramble_buffers && !(o->zero_buffers && + fio_option_is_set(o, zero_buffers))) td->flags |= TD_F_SCRAMBLE_BUFFERS; if (o->verify != VERIFY_NONE) td->flags |= TD_F_VER_NONE; @@ -1005,8 +1039,14 @@ static char *make_filename(char *buf, size_t buf_size,struct thread_options *o, ret = snprintf(dst, dst_left, "%s", jobname); if (ret < 0) break; - dst += ret; - dst_left -= ret; + else if (ret > dst_left) { + log_err("fio: truncated filename\n"); + dst += dst_left; + dst_left = 0; + } else { + dst += ret; + dst_left -= ret; + } break; } case FPRE_JOBNUM: { @@ -1015,8 +1055,14 @@ static char *make_filename(char *buf, size_t buf_size,struct thread_options *o, ret = snprintf(dst, dst_left, "%d", jobnum); if (ret < 0) break; - dst += ret; - dst_left -= ret; + else if (ret > dst_left) { + log_err("fio: truncated filename\n"); + dst += dst_left; + dst_left = 0; + } else { + dst += ret; + dst_left -= ret; + } break; } case FPRE_FILENUM: { @@ -1025,8 +1071,14 @@ static char *make_filename(char *buf, size_t buf_size,struct thread_options *o, ret = snprintf(dst, dst_left, "%d", filenum); if (ret < 0) break; - dst += ret; - dst_left -= ret; + else if (ret > dst_left) { + log_err("fio: truncated filename\n"); + dst += dst_left; + dst_left = 0; + } else { + dst += ret; + dst_left -= ret; + } break; } default: @@ -1679,8 +1731,10 @@ static void usage(const char *name) #ifdef CONFIG_ZLIB printf(" --inflate-log=log\tInflate and output compressed log\n"); #endif - printf(" --trigger=file:cmd\tExecute trigger cmd when file exists\n"); + printf(" --trigger-file=file\tExecute trigger cmd when file exists\n"); printf(" --trigger-timeout=t\tExecute trigger af this time\n"); + printf(" --trigger=cmd\t\tSet this command as local trigger\n"); + printf(" --trigger-remote=cmd\tSet this command as remote trigger\n"); printf("\nFio was written by Jens Axboe "); printf("\n Jens Axboe "); printf("\n Jens Axboe \n"); @@ -1858,6 +1912,30 @@ static void parse_cmd_client(void *client, char *opt) fio_client_add_cmd_option(client, opt); } +static void show_closest_option(const char *name) +{ + int best_option, best_distance; + int i, distance; + + while (*name == '-') + name++; + + best_option = -1; + best_distance = INT_MAX; + i = 0; + while (l_opts[i].name) { + distance = string_distance(name, l_opts[i].name); + if (distance < best_distance) { + best_distance = distance; + best_option = i; + } + i++; + } + + if (best_option != -1) + log_err("Did you mean %s?\n", l_opts[best_option].name); +} + int parse_cmd_line(int argc, char *argv[], int client_type) { struct thread_data *td = NULL; @@ -2057,6 +2135,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) td = NULL; } do_exit++; + exit_val = 1; break; } fio_options_set_ioengine_opts(l_opts, td); @@ -2075,6 +2154,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) td = NULL; } do_exit++; + exit_val = 1; } if (!ret && !strcmp(opt, "ioengine")) { @@ -2083,6 +2163,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) put_job(td); td = NULL; do_exit++; + exit_val = 1; break; } fio_options_set_ioengine_opts(l_opts, td); @@ -2181,7 +2262,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) case 'T': did_arg = 1; do_exit++; - exit_val = fio_monotonic_clocktest(); + exit_val = fio_monotonic_clocktest(1); break; case 'G': did_arg = 1; @@ -2200,33 +2281,21 @@ int parse_cmd_line(int argc, char *argv[], int client_type) status_interval = val / 1000; break; } - case 'W': { - char *split, *cmd; - size_t sz; - - split = strchr(optarg, ':'); - if (!split) { - log_err("fio: trigger is file:command\n"); - do_exit++; - exit_val = 1; - } - - sz = split - optarg; - if (sz) { - trigger_file = calloc(1, sz + 1); - strncpy(trigger_file, optarg, sz); - } - - split++; - cmd = trigger_cmd = strdup(split); - strip_blank_front(&trigger_cmd); - strip_blank_end(trigger_cmd); - if (strlen(trigger_cmd) == 0) { - free(cmd); - trigger_cmd = NULL; - } + case 'W': + if (trigger_file) + free(trigger_file); + trigger_file = strdup(optarg); + break; + case 'H': + if (trigger_cmd) + free(trigger_cmd); + trigger_cmd = strdup(optarg); + break; + case 'J': + if (trigger_remote_cmd) + free(trigger_remote_cmd); + trigger_remote_cmd = strdup(optarg); break; - } case 'B': if (check_str_time(optarg, &trigger_timeout, 1)) { log_err("fio: failed parsing time %s\n", optarg); @@ -2238,6 +2307,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type) case '?': log_err("%s: unrecognized option '%s'\n", argv[0], argv[optind - 1]); + show_closest_option(argv[optind - 1]); default: do_exit++; exit_val = 1; @@ -2355,12 +2425,6 @@ int parse_options(int argc, char *argv[]) return 0; } - if (def_thread.o.gtod_offload) { - fio_gtod_init(); - fio_gtod_offload = 1; - fio_gtod_cpu = def_thread.o.gtod_cpu; - } - if (output_format == FIO_OUTPUT_NORMAL) log_info("%s\n", fio_version_string);