#include <ctype.h>
#include <string.h>
#include <errno.h>
-#include <getopt.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/types.h>
#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)
FILE *f_err = NULL;
char *job_section = NULL;
char *exec_profile = NULL;
+int warnings_fatal = 0;
int write_bw_log = 0;
int read_only = 0;
.has_arg = required_argument,
.val = 'p',
},
+ {
+ .name = "warnings-fatal",
+ .has_arg = no_argument,
+ .val = 'w',
+ },
{
.name = NULL,
},
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;
dup_files(td, parent);
options_mem_dupe(td);
+ profile_add_hooks(td);
+
td->thread_number = thread_number;
return td;
}
{
if (td == &def_thread)
return;
+
+ profile_td_exit(td);
if (td->error)
log_info("fio: %s\n", td->verror);
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
static int fixup_options(struct thread_data *td)
{
struct thread_options *o = &td->o;
+ int ret;
#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;
+ ret = warnings_fatal;
}
#endif
log_err("fio: read iolog overrides write_iolog\n");
free(o->write_iolog_file);
o->write_iolog_file = NULL;
+ ret = warnings_fatal;
}
/*
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;
+ ret = warnings_fatal;
}
if (!o->file_size_high)
log_err("fio: norandommap given for variable block sizes, "
"verify disabled\n");
o->verify = VERIFY_NONE;
+ ret = warnings_fatal;
}
if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO))
log_err("fio: bs_unaligned may not work with raw io\n");
((o->ratemin[0] + o->ratemin[1]) && (o->rate_iops_min[0] +
o->rate_iops_min[1]))) {
log_err("fio: rate and rate_iops are mutually exclusive\n");
- return 1;
+ ret = 1;
}
if ((o->rate[0] < o->ratemin[0]) || (o->rate[1] < o->ratemin[1]) ||
(o->rate_iops[0] < o->rate_iops_min[0]) ||
(o->rate_iops[1] < o->rate_iops_min[1])) {
log_err("fio: minimum rate exceeds rate\n");
- return 1;
+ ret = 1;
}
if (!o->timeout && o->time_based) {
log_err("fio: time_based requires a runtime/timeout setting\n");
o->time_based = 0;
+ ret = warnings_fatal;
}
if (o->fill_device && !o->size)
o->size = -1ULL;
- 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 (o->verify != VERIFY_NONE) {
+ if (td_rw(td)) {
+ log_info("fio: mixed read/write workload with verify. "
+ "May not work as expected, unless you "
+ "pre-populated the file\n");
+ ret = warnings_fatal;
+ }
+ if (td_write(td) && o->numjobs > 1) {
+ log_info("Multiple writers may overwrite blocks that "
+ "belong to other jobs. This can cause "
+ "verification failures.\n");
+ ret = warnings_fatal;
+ }
- if (td->o.verify != VERIFY_NONE)
- td->o.refill_buffers = 1;
+ 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 (td->io_ops->flags & FIO_PIPEIO)
+ 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");
+ ret = warnings_fatal;
+ }
}
#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;
+ ret = warnings_fatal;
}
#endif
- return 0;
+ return ret;
}
/*
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;
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;
return 0;
}
+ if (profile_td_init(td))
+ return 1;
+
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
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;
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);
}
break;
}
+ name[strlen(name) - 1] = '\0';
+
if (skip_this_section(name)) {
inside_skip = 1;
continue;
global = !strncmp(name, "global", 6);
- name[strlen(name) - 1] = '\0';
-
if (dump_cmdline) {
if (first_sect)
log_info("fio ");
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;
}
static void usage(const char *name)
{
- printf("%s\n", fio_version_string);
printf("%s [options] [job options] <job file(s)>\n", name);
printf("\t--debug=options\tEnable debug logging\n");
printf("\t--output\tWrite output to file\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");
- printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>\n");
+ printf("\t--warnings-fatal Fio parser warnings are fatal\n");
+ printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
+ printf("\n Jens Axboe <jaxboe@fusionio.com>\n");
}
#ifdef FIO_INC_DEBUG
{ .name = "job", .shift = FD_JOB },
{ .name = "mutex", .shift = FD_MUTEX },
{ .name = "profile", .shift = FD_PROFILE },
+ { .name = "time", .shift = FD_TIME },
{ .name = NULL, },
};
case 'l':
write_lat_log = 1;
break;
- case 'w':
+ case 'b':
write_bw_log = 1;
break;
case 'o':
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))
ret = fio_cmd_option_parse(td, opt, val);
break;
}
+ case 'w':
+ warnings_fatal = 1;
+ break;
default:
do_exit++;
exit_val = 1;
f_out = stdout;
f_err = stderr;
+ log_info("%s\n", fio_version_string);
+
fio_options_dup_and_init(l_opts);
if (setup_thread_area())
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;
}
projects / fio.git / blobdiff