From: Jens Axboe Date: Wed, 5 Oct 2011 07:55:28 +0000 (+0200) Subject: Merge branch 'master' into client-server X-Git-Tag: fio-1.99~6 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=d5e3a0c6f5376e0d76143edb2c1622efd77f995f;hp=-c Merge branch 'master' into client-server Conflicts: init.c Signed-off-by: Jens Axboe --- d5e3a0c6f5376e0d76143edb2c1622efd77f995f diff --combined init.c index 6066fc59,4eb0df2d..142a1637 --- a/init.c +++ b/init.c @@@ -19,24 -19,17 +19,25 @@@ #include "filehash.h" #include "verify.h" #include "profile.h" +#include "server.h" #include "lib/getopt.h" -static char fio_version_string[] = "fio 1.58"; +#if FIO_PATCH > 0 +static char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \ + __fio_stringify(FIO_MINOR) "." \ + __fio_stringify(FIO_PATCH); +#else +static char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \ + __fio_stringify(FIO_MINOR); +#endif #define FIO_RANDSEED (0xb1899bedUL) static char **ini_file; static int max_jobs = FIO_MAX_JOBS; static int dump_cmdline; + static int def_timeout; static struct thread_data def_thread; struct thread_data *threads = NULL; @@@ -52,9 -45,6 +53,9 @@@ 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; @@@ -69,24 -59,6 +70,24 @@@ unsigned int *fio_debug_jobp = NULL static char cmd_optstr[256]; +const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = { + { .u.f = 1.0 }, + { .u.f = 5.0 }, + { .u.f = 10.0 }, + { .u.f = 20.0 }, + { .u.f = 30.0 }, + { .u.f = 40.0 }, + { .u.f = 50.0 }, + { .u.f = 60.0 }, + { .u.f = 70.0 }, + { .u.f = 80.0 }, + { .u.f = 90.0 }, + { .u.f = 95.0 }, + { .u.f = 99.0 }, + { .u.f = 99.5 }, + { .u.f = 99.9 }, +}; + /* * Command line options. These will contain the above, plus a few * extra that only pertain to fio itself and not jobs. @@@ -182,96 -154,19 +183,96 @@@ static struct option l_opts[FIO_NR_OPTI .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() +static void free_shm(void) { - return f_out; + struct shmid_ds sbuf; + + if (threads) { + void *tp = threads; + + threads = NULL; + file_hash_exit(); + fio_debug_jobp = NULL; + shmdt(tp); + shmctl(shm_id, IPC_RMID, &sbuf); + } + + scleanup(); } -FILE *get_f_err() +/* + * The thread area is shared between the main process and the job + * threads/processes. So setup a shared memory segment that will hold + * all the job info. We use the end of the region for keeping track of + * open files across jobs, for file sharing. + */ +static int setup_thread_area(void) { - return f_err; + void *hash; + + if (threads) + return 0; + + /* + * 1024 is too much on some machines, scale max_jobs if + * we get a failure that looks like too large a shm segment + */ + do { + size_t size = max_jobs * sizeof(struct thread_data); + + size += file_hash_size; + size += sizeof(unsigned int); + + shm_id = shmget(0, size, IPC_CREAT | 0600); + if (shm_id != -1) + break; + if (errno != EINVAL) { + perror("shmget"); + break; + } + + max_jobs >>= 1; + } while (max_jobs); + + if (shm_id == -1) + return 1; + + threads = shmat(shm_id, NULL, 0); + if (threads == (void *) -1) { + perror("shmat"); + return 1; + } + + memset(threads, 0, max_jobs * sizeof(struct thread_data)); + hash = (void *) threads + max_jobs * sizeof(struct thread_data); + fio_debug_jobp = (void *) hash + file_hash_size; + *fio_debug_jobp = -1; + file_hash_init(hash); + return 0; } /* @@@ -283,10 -178,6 +284,10 @@@ static struct thread_data *get_new_job( if (global) return &def_thread; + if (setup_thread_area()) { + log_err("error: failed to setup shm segment\n"); + return NULL; + } if (thread_number >= max_jobs) { log_err("error: maximum number of jobs (%d) reached.\n", max_jobs); @@@ -736,9 -627,9 +737,9 @@@ static int add_job(struct thread_data * td->ts.clat_percentiles = td->o.clat_percentiles; if (td->o.overwrite_plist) - td->ts.percentile_list = td->o.percentile_list; + memcpy(td->ts.percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list)); else - td->ts.percentile_list = NULL; + memcpy(td->ts.percentile_list, def_percentile_list, sizeof(def_percentile_list)); 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; @@@ -761,12 -652,12 +762,12 @@@ 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); @@@ -909,7 -800,7 +910,7 @@@ static int is_empty_or_comment(char *li /* * 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; @@@ -923,18 -814,14 +924,18 @@@ 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); @@@ -956,10 -843,7 +957,10 @@@ * 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; } @@@ -1013,14 -897,7 +1014,14 @@@ 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; @@@ -1073,7 -950,7 +1074,7 @@@ free(string); free(name); free(opts); - if (f != stdin) + if (!is_buf && f != stdin) fclose(f); return ret; } @@@ -1083,6 -960,7 +1084,7 @@@ static int fill_def_thread(void memset(&def_thread, 0, sizeof(def_thread)); fio_getaffinity(getpid(), &def_thread.o.cpumask); + def_thread.o.timeout = def_timeout; /* * fill default options @@@ -1091,6 -969,72 +1093,6 @@@ return 0; } -static void free_shm(void) -{ - struct shmid_ds sbuf; - - if (threads) { - void *tp = threads; - - threads = NULL; - file_hash_exit(); - fio_debug_jobp = NULL; - shmdt(tp); - shmctl(shm_id, IPC_RMID, &sbuf); - } - - scleanup(); -} - -/* - * The thread area is shared between the main process and the job - * threads/processes. So setup a shared memory segment that will hold - * all the job info. We use the end of the region for keeping track of - * open files across jobs, for file sharing. - */ -static int setup_thread_area(void) -{ - void *hash; - - /* - * 1024 is too much on some machines, scale max_jobs if - * we get a failure that looks like too large a shm segment - */ - do { - size_t size = max_jobs * sizeof(struct thread_data); - - size += file_hash_size; - size += sizeof(unsigned int); - - shm_id = shmget(0, size, IPC_CREAT | 0600); - if (shm_id != -1) - break; - if (errno != EINVAL) { - perror("shmget"); - break; - } - - max_jobs >>= 1; - } while (max_jobs); - - if (shm_id == -1) - return 1; - - threads = shmat(shm_id, NULL, 0); - if (threads == (void *) -1) { - perror("shmat"); - return 1; - } - - memset(threads, 0, max_jobs * sizeof(struct thread_data)); - hash = (void *) threads + max_jobs * sizeof(struct thread_data); - fio_debug_jobp = (void *) hash + file_hash_size; - *fio_debug_jobp = -1; - file_hash_init(hash); - atexit(free_shm); - return 0; -} - static void usage(const char *name) { printf("%s\n", fio_version_string); @@@ -1116,9 -1060,6 +1118,9 @@@ " (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"); } @@@ -1138,7 -1079,6 +1140,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, }, }; @@@ -1223,35 -1163,27 +1225,35 @@@ static void fio_options_fill_optstring( ostr[c] = '\0'; } -static int parse_cmd_line(int argc, char *argv[]) +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; + char *cur_client = NULL; + int backend = 0; while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) { switch (c) { case 'a': + fio_client_add_cmd_option(cur_client, argv[optind-1]); smalloc_pool_size = atoi(optarg); break; case 't': + fio_client_add_cmd_option(cur_client, argv[optind-1]); - def_thread.o.timeout = atoi(optarg); + def_timeout = atoi(optarg); break; case 'l': + fio_client_add_cmd_option(cur_client, argv[optind-1]); write_lat_log = 1; break; case 'b': + fio_client_add_cmd_option(cur_client, argv[optind-1]); write_bw_log = 1; break; case 'o': + fio_client_add_cmd_option(cur_client, argv[optind-1]); f_out = fopen(optarg, "w+"); if (!f_out) { perror("fopen output"); @@@ -1260,7 -1192,6 +1262,7 @@@ f_err = f_out; break; case 'm': + fio_client_add_cmd_option(cur_client, argv[optind-1]); terse_output = 1; break; case 'h': @@@ -1269,18 -1200,15 +1271,18 @@@ case 'c': exit(fio_show_option_help(optarg)); case 's': + fio_client_add_cmd_option(cur_client, argv[optind-1]); dump_cmdline = 1; break; case 'r': + fio_client_add_cmd_option(cur_client, argv[optind-1]); read_only = 1; break; case 'v': log_info("%s\n", fio_version_string); exit(0); case 'V': + fio_client_add_cmd_option(cur_client, argv[optind-1]); terse_version = atoi(optarg); if (terse_version != 2) { log_err("fio: bad terse version format\n"); @@@ -1289,22 -1217,18 +1291,22 @@@ } break; case 'e': + fio_client_add_cmd_option(cur_client, argv[optind-1]); if (!strcmp("always", optarg)) eta_print = FIO_ETA_ALWAYS; else if (!strcmp("never", optarg)) eta_print = FIO_ETA_NEVER; break; case 'd': + fio_client_add_cmd_option(cur_client, argv[optind-1]); if (set_debug(optarg)) do_exit++; break; case 'x': { size_t new_size; + fio_client_add_cmd_option(cur_client, argv[optind-1]); + if (!strcmp(optarg, "global")) { log_err("fio: can't use global as only " "section\n"); @@@ -1319,15 -1243,12 +1321,15 @@@ break; } case 'p': + fio_client_add_cmd_option(cur_client, argv[optind-1]); exec_profile = strdup(optarg); break; case FIO_GETOPT_JOB: { const char *opt = l_opts[lidx].name; char *val = optarg; + fio_client_add_cmd_option(cur_client, argv[optind-1]); + if (!strncmp(opt, "name", 4) && td) { ret = add_job(td, td->o.name ?: "fio", 0); if (ret) @@@ -1353,11 -1274,9 +1355,11 @@@ break; } case 'w': + fio_client_add_cmd_option(cur_client, argv[optind-1]); warnings_fatal = 1; break; case 'j': + fio_client_add_cmd_option(cur_client, argv[optind-1]); max_jobs = atoi(optarg); if (!max_jobs || max_jobs > REAL_MAX_JOBS) { log_err("fio: invalid max jobs: %d\n", max_jobs); @@@ -1365,53 -1284,16 +1367,53 @@@ 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; + 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); + cur_client = optarg; + break; default: do_exit++; exit_val = 1; break; } + if (do_exit) + break; } if (do_exit) exit(exit_val); + if (nr_clients && fio_clients_connect()) { + do_exit++; + exit_val = 1; + return -1; + } + + if (is_backend && backend) + return fio_start_server(daemonize_server); + if (td) { if (!ret) ret = add_job(td, td->o.name ?: "fio", 0); @@@ -1437,27 -1319,19 +1439,27 @@@ int parse_options(int argc, char *argv[ fio_options_fill_optstring(); fio_options_dup_and_init(l_opts); - if (setup_thread_area()) - return 1; + atexit(free_shm); + if (fill_def_thread()) return 1; job_files = parse_cmd_line(argc, 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 (job_files > 0) { + for (i = 0; i < job_files; i++) { + if (fill_def_thread()) + return 1; + 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); @@@ -1468,13 -1342,9 +1470,13 @@@ 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]); + if (job_files > 0) { + log_err("No jobs(s) defined\n\n"); + usage(argv[0]); + } return 1; }