X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=22b97950fb8ffaa5e08149ab483a802ccbb0c4cf;hp=baf3130b34f171fd73605794ba7dd0d5f70cb4dd;hb=7b9f733afb91a5c92f44bb6e68860f17ba14f585;hpb=4b0c257cd785cf7af4a4722f41bd45174283f69d diff --git a/init.c b/init.c index baf3130b..22b97950 100644 --- a/init.c +++ b/init.c @@ -19,10 +19,11 @@ #include "filehash.h" #include "verify.h" #include "profile.h" +#include "server.h" #include "lib/getopt.h" -static char fio_version_string[] = "fio 1.55"; +static char fio_version_string[] = "fio 1.58"; #define FIO_RANDSEED (0xb1899bedUL) @@ -43,11 +44,14 @@ char **job_sections = NULL; int nr_job_sections = 0; char *exec_profile = NULL; int warnings_fatal = 0; +int terse_version = 2; +int is_backend = 0; +int nr_clients = 0; +int log_syslog = 0; int write_bw_log = 0; int read_only = 0; -static int def_timeout; static int write_lat_log; static int prev_group_jobs; @@ -148,21 +152,35 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'j', }, + { + .name = (char *) "terse-version", + .has_arg = required_argument, + .val = 'V', + }, + { + .name = (char *) "server", + .has_arg = no_argument, + .val = 'S', + }, + { .name = (char *) "daemonize", + .has_arg = no_argument, + .val = 'D', + }, + { + .name = (char *) "net-port", + .has_arg = required_argument, + .val = 'P', + }, + { + .name = (char *) "client", + .has_arg = required_argument, + .val = 'C', + }, { .name = NULL, }, }; -FILE *get_f_out() -{ - return f_out; -} - -FILE *get_f_err() -{ - return f_err; -} - /* * Return a free job structure. */ @@ -516,6 +534,8 @@ void td_fill_rand_seeds(struct thread_data *td) td_fill_rand_seeds_os(td); else td_fill_rand_seeds_internal(td); + + init_rand_seed(&td->buf_state, td->rand_seeds[7]); } /* @@ -617,6 +637,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->mutex = fio_mutex_init(0); + td->ts.clat_percentiles = td->o.clat_percentiles; + if (td->o.overwrite_plist) + td->ts.percentile_list = td->o.percentile_list; + else + td->ts.percentile_list = NULL; + td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX; td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX; td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX; @@ -638,12 +664,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) goto err; if (td->o.write_lat_log) { - setup_log(&td->ts.lat_log); - setup_log(&td->ts.slat_log); - setup_log(&td->ts.clat_log); + setup_log(&td->lat_log); + setup_log(&td->slat_log); + setup_log(&td->clat_log); } if (td->o.write_bw_log) - setup_log(&td->ts.bw_log); + setup_log(&td->bw_log); if (!td->o.name) td->o.name = strdup(jobname); @@ -776,7 +802,7 @@ static int is_empty_or_comment(char *line) return 1; if (line[i] == '#') return 1; - if (!isspace(line[i]) && !iscntrl(line[i])) + if (!isspace((int) line[i]) && !iscntrl((int) line[i])) return 0; } @@ -786,7 +812,7 @@ static int is_empty_or_comment(char *line) /* * This is our [ini] type file parser. */ -static int parse_jobs_ini(char *file, int stonewall_flag) +int parse_jobs_ini(char *file, int is_buf, int stonewall_flag) { unsigned int global; struct thread_data *td; @@ -800,14 +826,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag) char **opts; int i, alloc_opts, num_opts; - if (!strcmp(file, "-")) - f = stdin; - else - f = fopen(file, "r"); + if (is_buf) + f = NULL; + else { + if (!strcmp(file, "-")) + f = stdin; + else + f = fopen(file, "r"); - if (!f) { - perror("fopen job file"); - return 1; + if (!f) { + perror("fopen job file"); + return 1; + } } string = malloc(4096); @@ -829,7 +859,10 @@ static int parse_jobs_ini(char *file, int stonewall_flag) * haven't handled. */ if (!skip_fgets) { - p = fgets(string, 4095, f); + if (is_buf) + p = strsep(&file, "\n"); + else + p = fgets(string, 4095, f); if (!p) break; } @@ -883,7 +916,14 @@ static int parse_jobs_ini(char *file, int stonewall_flag) num_opts = 0; memset(opts, 0, alloc_opts * sizeof(char *)); - while ((p = fgets(string, 4096, f)) != NULL) { + while (1) { + if (is_buf) + p = strsep(&file, "\n"); + else + p = fgets(string, 4096, f); + if (!p) + break; + if (is_empty_or_comment(p)) continue; @@ -936,7 +976,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag) free(string); free(name); free(opts); - if (f != stdin) + if (!is_buf && f != stdin) fclose(f); return ret; } @@ -951,8 +991,6 @@ static int fill_def_thread(void) * fill default options */ fio_fill_default_options(&def_thread); - - def_thread.o.timeout = def_timeout; return 0; } @@ -1024,6 +1062,7 @@ static int setup_thread_area(void) static void usage(const char *name) { + printf("%s\n", fio_version_string); printf("%s [options] [job options] \n", name); printf("\t--debug=options\tEnable debug logging\n"); printf("\t--output\tWrite output to file\n"); @@ -1032,6 +1071,7 @@ static void usage(const char *name) printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n"); printf("\t--minimal\tMinimal (terse) output\n"); printf("\t--version\tPrint version info and exit\n"); + printf("\t--terse-version=x Terse version output format\n"); printf("\t--help\t\tPrint this page\n"); printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of" " them\n"); @@ -1045,6 +1085,9 @@ static void usage(const char *name) " (def 1024)\n"); printf("\t--warnings-fatal Fio parser warnings are fatal\n"); printf("\t--max-jobs\tMaximum number of threads/processes to support\n"); + printf("\t--server\tStart a backend fio server\n"); + printf("\t--client=hostname Talk to remove backend fio server at hostname\n"); + printf("\t--net-port=port\tUse specified port for client/server connection\n"); printf("\nFio was written by Jens Axboe "); printf("\n Jens Axboe \n"); } @@ -1064,6 +1107,7 @@ struct debug_level debug_levels[] = { { .name = "mutex", .shift = FD_MUTEX }, { .name = "profile", .shift = FD_PROFILE }, { .name = "time", .shift = FD_TIME }, + { .name = "net", .shift = FD_NET }, { .name = NULL, }, }; @@ -1153,6 +1197,7 @@ static int parse_cmd_line(int argc, char *argv[]) struct thread_data *td = NULL; int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0; char *ostr = cmd_optstr; + int daemonize_server = 0; while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) { switch (c) { @@ -1160,7 +1205,7 @@ static int parse_cmd_line(int argc, char *argv[]) smalloc_pool_size = atoi(optarg); break; case 't': - def_timeout = atoi(optarg); + def_thread.o.timeout = atoi(optarg); break; case 'l': write_lat_log = 1; @@ -1193,6 +1238,14 @@ static int parse_cmd_line(int argc, char *argv[]) case 'v': log_info("%s\n", fio_version_string); exit(0); + case 'V': + terse_version = atoi(optarg); + if (terse_version != 2) { + log_err("fio: bad terse version format\n"); + exit_val = 1; + do_exit++; + } + break; case 'e': if (!strcmp("always", optarg)) eta_print = FIO_ETA_ALWAYS; @@ -1261,6 +1314,30 @@ static int parse_cmd_line(int argc, char *argv[]) exit_val = 1; } break; + case 'S': + if (nr_clients) { + log_err("fio: can't be both client and server\n"); + do_exit++; + exit_val = 1; + break; + } + is_backend = 1; + break; + case 'D': + daemonize_server = 1; + break; + case 'P': + fio_net_port = atoi(optarg); + break; + case 'C': + if (is_backend) { + log_err("fio: can't be both client and server\n"); + do_exit++; + exit_val = 1; + break; + } + fio_client_add(optarg); + break; default: do_exit++; exit_val = 1; @@ -1271,6 +1348,15 @@ static int parse_cmd_line(int argc, char *argv[]) if (do_exit) exit(exit_val); + if (nr_clients && fio_clients_connect()) { + do_exit++; + exit_val = 1; + return 1; + } + + if (is_backend) + return fio_start_server(daemonize_server); + if (td) { if (!ret) ret = add_job(td, td->o.name ?: "fio", 0); @@ -1306,9 +1392,15 @@ int parse_options(int argc, char *argv[]) for (i = 0; i < job_files; i++) { if (fill_def_thread()) return 1; - if (parse_jobs_ini(ini_file[i], i)) - return 1; - free(ini_file[i]); + if (nr_clients) { + if (fio_clients_send_ini(ini_file[i])) + return 1; + free(ini_file[i]); + } else if (!is_backend) { + if (parse_jobs_ini(ini_file[i], 0, i)) + return 1; + free(ini_file[i]); + } } free(ini_file); @@ -1319,6 +1411,8 @@ int parse_options(int argc, char *argv[]) return 0; if (exec_profile) return 0; + if (is_backend || nr_clients) + return 0; log_err("No jobs(s) defined\n\n"); usage(argv[0]);