X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=ca4e2bf6c77b508619d04684f606f479062c3a5d;hp=e53f103f65bf1f8f6659fe51a2b9d97d1cda72c4;hb=8ad45fc1f41d29f9fc28a67c2fc11d48f5c17c7f;hpb=2e5cdb118aeb26cb469a50f746b632676306f698 diff --git a/init.c b/init.c index e53f103f..ca4e2bf6 100644 --- a/init.c +++ b/init.c @@ -17,8 +17,9 @@ #include "fio.h" #include "parse.h" #include "smalloc.h" +#include "filehash.h" -static char fio_version_string[] = "fio 1.19"; +static char fio_version_string[] = "fio 1.21-rc2"; #define FIO_RANDSEED (0xb1899bedUL) @@ -40,18 +41,20 @@ char *job_section = NULL; int write_bw_log = 0; int read_only = 0; -static int def_timeout = 0; -static int write_lat_log = 0; +static int def_timeout; +static int write_lat_log; static int prev_group_jobs; unsigned long fio_debug = 0; +unsigned int fio_debug_jobno = -1; +unsigned int *fio_debug_jobp = NULL; /* * Command line options. These will contain the above, plus a few * extra that only pertain to fio itself and not jobs. */ -static struct option long_options[FIO_NR_OPTIONS] = { +static struct option l_opts[FIO_NR_OPTIONS] = { { .name = "output", .has_arg = required_argument, @@ -117,6 +120,11 @@ static struct option long_options[FIO_NR_OPTIONS] = { .has_arg = required_argument, .val = 'x', }, + { + .name = "alloc-size", + .has_arg = required_argument, + .val = 'a', + }, { .name = NULL, }, @@ -207,10 +215,11 @@ static int fixup_options(struct thread_data *td) struct thread_options *o = &td->o; if (read_only && td_write(td)) { - log_err("fio: job <%s> has write bit set, but fio is in read-only mode\n", td->o.name); + log_err("fio: job <%s> has write bit set, but fio is in" + " read-only mode\n", td->o.name); return 1; } - + if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100) o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ]; @@ -233,11 +242,11 @@ static int fixup_options(struct thread_data *td) o->overwrite = 1; if (!o->min_bs[DDIR_READ]) - o->min_bs[DDIR_READ]= o->bs[DDIR_READ]; + o->min_bs[DDIR_READ] = o->bs[DDIR_READ]; if (!o->max_bs[DDIR_READ]) o->max_bs[DDIR_READ] = o->bs[DDIR_READ]; if (!o->min_bs[DDIR_WRITE]) - o->min_bs[DDIR_WRITE]= o->bs[DDIR_WRITE]; + o->min_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; if (!o->max_bs[DDIR_WRITE]) o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; @@ -302,11 +311,14 @@ static int fixup_options(struct thread_data *td) if (o->fill_device && !o->size) o->size = ULONG_LONG_MAX; - + if (td_rw(td) && td->o.verify != VERIFY_NONE) log_info("fio: mixed read/write workload with verify. May not " "work as expected, unless you pre-populated the file\n"); + if (td->o.verify != VERIFY_NONE) + td->o.refill_buffers = 1; + return 0; } @@ -444,14 +456,15 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td->io_ops->flags |= FIO_RAWIO; file_alloced = 0; - if (!td->o.filename && !td->files_index) { + if (!td->o.filename && !td->files_index && !td->o.read_iolog_file) { file_alloced = 1; if (td->o.nr_files == 1 && exists_and_not_file(jobname)) add_file(td, jobname); else { for (i = 0; i < td->o.nr_files; i++) { - sprintf(fname, "%s.%d.%d", jobname, td->thread_number, i); + sprintf(fname, "%s.%d.%d", jobname, + td->thread_number, i); add_file(td, fname); } } @@ -501,9 +514,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (!terse_output) { if (!job_add_num) { - if (!strcmp(td->io_ops->name, "cpuio")) - log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->o.name, td->o.cpuload, td->o.cpucycle); - else { + if (!strcmp(td->io_ops->name, "cpuio")) { + log_info("%s: ioengine=cpu, cpuload=%u," + " cpucycle=%u\n", td->o.name, + td->o.cpuload, + td->o.cpucycle); + } else { char *c1, *c2, *c3, *c4; c1 = to_kmg(td->o.min_bs[DDIR_READ]); @@ -511,7 +527,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) c3 = to_kmg(td->o.min_bs[DDIR_WRITE]); c4 = to_kmg(td->o.max_bs[DDIR_WRITE]); - log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->o.name, td->groupid, ddir_str[td->o.td_ddir], c1, c2, c3, c4, td->io_ops->name, td->o.iodepth); + log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s," + " ioengine=%s, iodepth=%u\n", + td->o.name, td->groupid, + ddir_str[td->o.td_ddir], + c1, c2, c3, c4, + td->io_ops->name, + td->o.iodepth); free(c1); free(c2); @@ -635,7 +657,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag) if (sscanf(p, "[%255s]", name) != 1) { if (inside_skip) continue; - log_err("fio: option <%s> outside of [] job section\n", p); + log_err("fio: option <%s> outside of [] job section\n", + p); break; } @@ -739,8 +762,12 @@ static void free_shm(void) struct shmid_ds sbuf; if (threads) { - shmdt((void *) threads); + void *tp = threads; + threads = NULL; + file_hash_exit(); + fio_debug_jobp = NULL; + shmdt(tp); shmctl(shm_id, IPC_RMID, &sbuf); } @@ -750,10 +777,13 @@ static void free_shm(void) /* * 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. + * 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 @@ -761,6 +791,9 @@ static int setup_thread_area(void) 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; @@ -782,6 +815,10 @@ static int setup_thread_area(void) } 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; } @@ -798,12 +835,16 @@ static void usage(const char *name) printf("\t--minimal\tMinimal (terse) output\n"); printf("\t--version\tPrint version info and exit\n"); printf("\t--help\t\tPrint this page\n"); - printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n"); + printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of" + " them\n"); printf("\t--showcmd\tTurn a job file into command line options\n"); printf("\t--eta=when\tWhen ETA estimate should be printed\n"); printf("\t \tMay be \"always\", \"never\" or \"auto\"\n"); - printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n"); + printf("\t--readonly\tTurn on safety read-only checks, preventing" + " writes\n"); printf("\t--section=name\tOnly run specified section in job file\n"); + printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb" + " (def 1024)\n"); } #ifdef FIO_INC_DEBUG @@ -816,6 +857,8 @@ struct debug_level debug_levels[] = { { .name = "verify", .shift = FD_VERIFY }, { .name = "random", .shift = FD_RANDOM }, { .name = "parse", .shift = FD_PARSE }, + { .name = "diskutil", .shift = FD_DISKUTIL }, + { .name = "job", .shift = FD_JOB }, { }, }; @@ -836,22 +879,38 @@ static int set_debug(const char *string) } log_info("all\n"); return 1; - } else if (!strcmp(string, "all")) { - fio_debug = ~0UL; - return 0; } while ((opt = strsep(&p, ",")) != NULL) { int found = 0; + if (!strncmp(opt, "all", 3)) { + log_info("fio: set all debug options\n"); + fio_debug = ~0UL; + continue; + } + for (i = 0; debug_levels[i].name; i++) { dl = &debug_levels[i]; - if (!strncmp(opt, dl->name, strlen(opt))) { + found = !strncmp(opt, dl->name, strlen(dl->name)); + if (!found) + continue; + + if (dl->shift == FD_JOB) { + opt = strchr(opt, ':'); + if (!opt) { + log_err("fio: missing job number\n"); + break; + } + opt++; + fio_debug_jobno = atoi(opt); + log_info("fio: set debug jobno %d\n", + fio_debug_jobno); + } else { log_info("fio: set debug option %s\n", opt); - found = 1; fio_debug |= (1UL << dl->shift); - break; } + break; } if (!found) @@ -872,8 +931,11 @@ 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; - while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) { + while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) { switch (c) { + case 'a': + smalloc_pool_size = atoi(optarg); + break; case 't': def_timeout = atoi(optarg); break; @@ -920,7 +982,8 @@ static int parse_cmd_line(int argc, char *argv[]) break; case 'x': if (!strcmp(optarg, "global")) { - log_err("fio: can't use global as only section\n"); + log_err("fio: can't use global as only " + "section\n"); do_exit++; exit_val = 1; break; @@ -930,7 +993,7 @@ static int parse_cmd_line(int argc, char *argv[]) job_section = strdup(optarg); break; case FIO_GETOPT_JOB: { - const char *opt = long_options[lidx].name; + const char *opt = l_opts[lidx].name; char *val = optarg; if (!strncmp(opt, "name", 4) && td) { @@ -993,7 +1056,7 @@ int parse_options(int argc, char *argv[]) f_out = stdout; f_err = stderr; - fio_options_dup_and_init(long_options); + fio_options_dup_and_init(l_opts); if (setup_thread_area()) return 1;