X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=682135ba797cac3bc43bf5b17ce7b84862455a80;hp=e7245ade0313ef92fa659e60250223b729448986;hb=964f5b9b267e3c87035309b9838c357613bfa209;hpb=d990588ef84dacb107971143c239565e149d6f73;ds=sidebyside diff --git a/init.c b/init.c index e7245ade..682135ba 100644 --- a/init.c +++ b/init.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -21,7 +20,9 @@ #include "verify.h" #include "profile.h" -static char fio_version_string[] = "fio 1.37"; +#include "lib/getopt.h" + +static char fio_version_string[] = "fio 1.50-rc3"; #define FIO_RANDSEED (0xb1899bedUL) @@ -157,8 +158,11 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) if (global) return &def_thread; - if (thread_number >= max_jobs) + if (thread_number >= max_jobs) { + log_err("error: maximum number of jobs (%d) reached.\n", + max_jobs); return NULL; + } td = &threads[thread_number++]; *td = *parent; @@ -193,6 +197,8 @@ static int __setup_rate(struct thread_data *td, enum fio_ddir ddir) unsigned int bs = td->o.min_bs[ddir]; unsigned long long bytes_per_sec; + assert(ddir_rw(ddir)); + if (td->o.rate[ddir]) bytes_per_sec = td->o.rate[ddir]; else @@ -236,11 +242,11 @@ static int fixup_options(struct thread_data *td) struct thread_options *o = &td->o; #ifndef FIO_HAVE_PSHARED_MUTEX - if (!td->o.use_thread) { + if (!o->use_thread) { log_info("fio: this platform does not support process shared" " mutexes, forcing use of threads. Use the 'thread'" " option to get rid of this warning.\n"); - td->o.use_thread = 1; + o->use_thread = 1; } #endif @@ -283,9 +289,9 @@ static int fixup_options(struct thread_data *td) if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] || o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) && - !td->o.norandommap) { + !o->norandommap) { log_err("fio: Any use of blockalign= turns off randommap\n"); - td->o.norandommap = 1; + o->norandommap = 1; } if (!o->file_size_high) @@ -354,32 +360,32 @@ static int fixup_options(struct thread_data *td) if (o->fill_device && !o->size) o->size = -1ULL; - if (td_rw(td) && td->o.verify != VERIFY_NONE) + if (td_rw(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; + if (o->verify != VERIFY_NONE) { + o->refill_buffers = 1; if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] && !o->verify_interval) o->verify_interval = o->min_bs[DDIR_WRITE]; } - if (td->o.pre_read) { - td->o.invalidate_cache = 0; + if (o->pre_read) { + o->invalidate_cache = 0; if (td->io_ops->flags & FIO_PIPEIO) log_info("fio: cannot pre-read files with an IO engine" " that isn't seekable. Pre-read disabled.\n"); } #ifndef FIO_HAVE_FDATASYNC - if (td->o.fdatasync_blocks) { + if (o->fdatasync_blocks) { log_info("fio: this platform does not support fdatasync()" " falling back to using fsync(). Use the 'fsync'" " option instead of 'fdatasync' to get rid of" " this warning\n"); - td->o.fsync_blocks = td->o.fdatasync_blocks; - td->o.fdatasync_blocks = 0; + o->fsync_blocks = o->fdatasync_blocks; + o->fdatasync_blocks = 0; } #endif @@ -428,7 +434,9 @@ static int exists_and_not_file(const char *filename) if (lstat(filename, &sb) == -1) return 0; - if (S_ISREG(sb.st_mode)) + /* \\.\ is the device namespace in Windows, where every file + * is a device node */ + if (S_ISREG(sb.st_mode) && strncmp(filename, "\\\\.\\", 4) != 0) return 0; return 1; @@ -444,6 +452,7 @@ void td_fill_rand_seeds(struct thread_data *td) os_random_seed(td->rand_seeds[3], &td->next_file_state); os_random_seed(td->rand_seeds[5], &td->file_size_state); + os_random_seed(td->rand_seeds[6], &td->trim_state); if (!td_random(td)) return; @@ -555,8 +564,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) 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; td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX; - td->ddir_nr = td->o.ddir_nr; + td->ddir_seq_nr = td->o.ddir_seq_nr; if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) { prev_group_jobs = 0; @@ -573,6 +583,7 @@ 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); } @@ -776,6 +787,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag) break; } + name[strlen(name) - 1] = '\0'; + if (skip_this_section(name)) { inside_skip = 1; continue; @@ -784,8 +797,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag) global = !strncmp(name, "global", 6); - name[strlen(name) - 1] = '\0'; - if (dump_cmdline) { if (first_sect) log_info("fio "); @@ -881,9 +892,6 @@ static int fill_def_thread(void) fio_fill_default_options(&def_thread); def_thread.o.timeout = def_timeout; - def_thread.o.write_bw_log = write_bw_log; - def_thread.o.write_lat_log = write_lat_log; - return 0; } @@ -955,7 +963,6 @@ 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"); @@ -975,7 +982,8 @@ static void usage(const char *name) 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"); - printf("\nFio was written by Jens Axboe \n"); + printf("\nFio was written by Jens Axboe "); + printf("\n Jens Axboe \n"); } #ifdef FIO_INC_DEBUG @@ -992,6 +1000,7 @@ struct debug_level debug_levels[] = { { .name = "job", .shift = FD_JOB }, { .name = "mutex", .shift = FD_MUTEX }, { .name = "profile", .shift = FD_PROFILE }, + { .name = "time", .shift = FD_TIME }, { .name = NULL, }, }; @@ -1075,7 +1084,7 @@ static int parse_cmd_line(int argc, char *argv[]) case 'l': write_lat_log = 1; break; - case 'w': + case 'b': write_bw_log = 1; break; case 'o': @@ -1101,7 +1110,7 @@ static int parse_cmd_line(int argc, char *argv[]) read_only = 1; break; case 'v': - printf("%s\n", fio_version_string); + /* already being printed, just quit */ exit(0); case 'e': if (!strcmp("always", optarg)) @@ -1192,6 +1201,8 @@ int parse_options(int argc, char *argv[]) f_out = stdout; f_err = stderr; + log_info("%s\n", fio_version_string); + fio_options_dup_and_init(l_opts); if (setup_thread_area()) @@ -1218,7 +1229,7 @@ int parse_options(int argc, char *argv[]) if (exec_profile) return 0; - log_err("No jobs defined(s)\n\n"); + log_err("No jobs(s) defined\n\n"); usage(argv[0]); return 1; }