X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=108f2b88d1ae611f20308f8c09a8d41f7b61e5b2;hb=21750a254b5481f78ac3c6697754abf3cfa63e89;hp=e2084516327918a04bcb6966707591c6598478a5;hpb=b32709219cd352ff96fb50f274597b78f3602eb7;p=fio.git diff --git a/init.c b/init.c index e2084516..108f2b88 100644 --- a/init.c +++ b/init.c @@ -64,6 +64,10 @@ int write_bw_log = 0; int read_only = 0; int status_interval = 0; +char *trigger_file = NULL; +char *trigger_cmd = NULL; +long long trigger_timeout = 0; + static int prev_group_jobs; unsigned long fio_debug = 0; @@ -216,6 +220,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'C', }, + { + .name = (char *) "remote-config", + .has_arg = required_argument, + .val = 'R', + }, { .name = (char *) "cpuclock-test", .has_arg = no_argument, @@ -236,6 +245,16 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'L', }, + { + .name = (char *) "trigger", + .has_arg = required_argument, + .val = 'W', + }, + { + .name = (char *) "trigger-timeout", + .has_arg = required_argument, + .val = 'B', + }, { .name = NULL, }, @@ -465,13 +484,8 @@ static unsigned long long get_rand_start_delay(struct thread_data *td) delayrange = td->o.start_delay_high - td->o.start_delay; - if (td->o.use_os_rand) { - r = os_random_long(&td->delay_state); - delayrange = (unsigned long long) ((double) delayrange * (r / (OS_RAND_MAX + 1.0))); - } else { - r = __rand(&td->__delay_state); - delayrange = (unsigned long long) ((double) delayrange * (r / (FRAND_MAX + 1.0))); - } + r = __rand(&td->delay_state); + delayrange = (unsigned long long) ((double) delayrange * (r / (FRAND_MAX + 1.0))); delayrange += td->o.start_delay; return delayrange; @@ -782,44 +796,18 @@ static int exists_and_not_file(const char *filename) return 1; } -static void td_fill_rand_seeds_os(struct thread_data *td) -{ - os_random_seed(td->rand_seeds[FIO_RAND_BS_OFF], &td->bsrange_state); - os_random_seed(td->rand_seeds[FIO_RAND_VER_OFF], &td->verify_state); - os_random_seed(td->rand_seeds[FIO_RAND_MIX_OFF], &td->rwmix_state); - - if (td->o.file_service_type == FIO_FSERVICE_RANDOM) - os_random_seed(td->rand_seeds[FIO_RAND_FILE_OFF], &td->next_file_state); - - os_random_seed(td->rand_seeds[FIO_RAND_FILE_SIZE_OFF], &td->file_size_state); - os_random_seed(td->rand_seeds[FIO_RAND_TRIM_OFF], &td->trim_state); - os_random_seed(td->rand_seeds[FIO_RAND_START_DELAY], &td->delay_state); - - if (!td_random(td)) - return; - - if (td->o.rand_repeatable) - td->rand_seeds[FIO_RAND_BLOCK_OFF] = FIO_RANDSEED * td->thread_number; - - os_random_seed(td->rand_seeds[FIO_RAND_BLOCK_OFF], &td->random_state); - - os_random_seed(td->rand_seeds[FIO_RAND_SEQ_RAND_READ_OFF], &td->seq_rand_state[DDIR_READ]); - os_random_seed(td->rand_seeds[FIO_RAND_SEQ_RAND_WRITE_OFF], &td->seq_rand_state[DDIR_WRITE]); - os_random_seed(td->rand_seeds[FIO_RAND_SEQ_RAND_TRIM_OFF], &td->seq_rand_state[DDIR_TRIM]); -} - static void td_fill_rand_seeds_internal(struct thread_data *td) { - init_rand_seed(&td->__bsrange_state, td->rand_seeds[FIO_RAND_BS_OFF]); - init_rand_seed(&td->__verify_state, td->rand_seeds[FIO_RAND_VER_OFF]); - init_rand_seed(&td->__rwmix_state, td->rand_seeds[FIO_RAND_MIX_OFF]); + init_rand_seed(&td->bsrange_state, td->rand_seeds[FIO_RAND_BS_OFF]); + init_rand_seed(&td->verify_state, td->rand_seeds[FIO_RAND_VER_OFF]); + init_rand_seed(&td->rwmix_state, td->rand_seeds[FIO_RAND_MIX_OFF]); if (td->o.file_service_type == FIO_FSERVICE_RANDOM) - init_rand_seed(&td->__next_file_state, td->rand_seeds[FIO_RAND_FILE_OFF]); + init_rand_seed(&td->next_file_state, td->rand_seeds[FIO_RAND_FILE_OFF]); - init_rand_seed(&td->__file_size_state, td->rand_seeds[FIO_RAND_FILE_SIZE_OFF]); - init_rand_seed(&td->__trim_state, td->rand_seeds[FIO_RAND_TRIM_OFF]); - init_rand_seed(&td->__delay_state, td->rand_seeds[FIO_RAND_START_DELAY]); + init_rand_seed(&td->file_size_state, td->rand_seeds[FIO_RAND_FILE_SIZE_OFF]); + init_rand_seed(&td->trim_state, td->rand_seeds[FIO_RAND_TRIM_OFF]); + init_rand_seed(&td->delay_state, td->rand_seeds[FIO_RAND_START_DELAY]); if (!td_random(td)) return; @@ -827,10 +815,10 @@ static void td_fill_rand_seeds_internal(struct thread_data *td) if (td->o.rand_repeatable) td->rand_seeds[FIO_RAND_BLOCK_OFF] = FIO_RANDSEED * td->thread_number; - init_rand_seed(&td->__random_state, td->rand_seeds[FIO_RAND_BLOCK_OFF]); - init_rand_seed(&td->__seq_rand_state[DDIR_READ], td->rand_seeds[FIO_RAND_SEQ_RAND_READ_OFF]); - init_rand_seed(&td->__seq_rand_state[DDIR_WRITE], td->rand_seeds[FIO_RAND_SEQ_RAND_WRITE_OFF]); - init_rand_seed(&td->__seq_rand_state[DDIR_TRIM], td->rand_seeds[FIO_RAND_SEQ_RAND_TRIM_OFF]); + init_rand_seed(&td->random_state, td->rand_seeds[FIO_RAND_BLOCK_OFF]); + init_rand_seed(&td->seq_rand_state[DDIR_READ], td->rand_seeds[FIO_RAND_SEQ_RAND_READ_OFF]); + init_rand_seed(&td->seq_rand_state[DDIR_WRITE], td->rand_seeds[FIO_RAND_SEQ_RAND_WRITE_OFF]); + init_rand_seed(&td->seq_rand_state[DDIR_TRIM], td->rand_seeds[FIO_RAND_SEQ_RAND_TRIM_OFF]); } void td_fill_rand_seeds(struct thread_data *td) @@ -843,10 +831,7 @@ void td_fill_rand_seeds(struct thread_data *td) + i; } - if (td->o.use_os_rand) - td_fill_rand_seeds_os(td); - else - td_fill_rand_seeds_internal(td); + td_fill_rand_seeds_internal(td); init_rand_seed(&td->buf_state, td->rand_seeds[FIO_RAND_BUF_OFF]); frand_copy(&td->buf_state_prev, &td->buf_state); @@ -1424,7 +1409,11 @@ int __parse_jobs_ini(struct thread_data *td, f = fopen(file, "r"); if (!f) { - perror("fopen job file"); + int __err = errno; + + log_err("fio: unable to open '%s' job file\n", file); + if (td) + td_verror(td, __err, "job file open"); return 1; } } @@ -1482,6 +1471,7 @@ int __parse_jobs_ini(struct thread_data *td, log_err("fio: option <%s> outside of " "[] job section\n", p); + ret = 1; break; } @@ -1682,12 +1672,15 @@ static void usage(const char *name) printf(" --server=args\t\tStart a backend fio server\n"); printf(" --daemonize=pidfile\tBackground fio server, write pid to file\n"); printf(" --client=hostname\tTalk to remote backend fio server at hostname\n"); + printf(" --remote-config=file\tTell fio server to load this local job file\n"); printf(" --idle-prof=option\tReport cpu idleness on a system or percpu basis\n" "\t\t\t(option=system,percpu) or run unit work\n" "\t\t\tcalibration only (option=calibrate)\n"); #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-timeout=t\tExecute trigger af this time\n"); printf("\nFio was written by Jens Axboe "); printf("\n Jens Axboe "); printf("\n Jens Axboe \n"); @@ -1991,12 +1984,12 @@ int parse_cmd_line(int argc, char *argv[], int client_type) case 'E': { long long t = 0; - if (str_to_decimal(optarg, &t, 0, NULL, 1)) { + if (check_str_time(optarg, &t, 1)) { log_err("fio: failed parsing eta time %s\n", optarg); exit_val = 1; do_exit++; } - eta_new_line = t; + eta_new_line = t / 1000; break; } case 'd': @@ -2173,10 +2166,18 @@ int parse_cmd_line(int argc, char *argv[], int client_type) !strncmp(argv[optind], "-", 1)) break; - fio_client_add_ini_file(cur_client, argv[optind]); + if (fio_client_add_ini_file(cur_client, argv[optind], 0)) + break; optind++; } break; + case 'R': + did_arg = 1; + if (fio_client_add_ini_file(cur_client, optarg, 1)) { + do_exit++; + exit_val = 1; + } + break; case 'T': did_arg = 1; do_exit++; @@ -2190,15 +2191,50 @@ int parse_cmd_line(int argc, char *argv[], int client_type) case 'L': { long long val; - if (check_str_time(optarg, &val, 0)) { + if (check_str_time(optarg, &val, 1)) { log_err("fio: failed parsing time %s\n", optarg); do_exit++; exit_val = 1; break; } - status_interval = val * 1000; + 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; + } + break; + } + case 'B': + if (check_str_time(optarg, &trigger_timeout, 1)) { + log_err("fio: failed parsing time %s\n", optarg); + do_exit++; + exit_val = 1; + } + trigger_timeout /= 1000000; + break; case '?': log_err("%s: unrecognized option '%s'\n", argv[0], argv[optind - 1]);