#include "fio.h"
#include "parse.h"
-static char fio_version_string[] = "fio 1.15.2";
+static char fio_version_string[] = "fio 1.17.1";
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
static int max_jobs = MAX_JOBS;
static int dump_cmdline;
+static int read_only;
struct thread_data def_thread;
struct thread_data *threads = NULL;
{
.name = "showcmd",
.has_arg = no_argument,
- .val = 's'
+ .val = 's',
+ },
+ {
+ .name = "readonly",
+ .has_arg = no_argument,
+ .val = 'r',
},
{
.name = NULL,
{
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);
+ return 1;
+ }
+
if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
if (!o->file_size_high)
o->file_size_high = o->file_size_low;
- if (td_read(td) && !td_rw(td))
- o->verify = 0;
-
if (o->norandommap && o->verify != VERIFY_NONE) {
log_err("fio: norandommap given, verify disabled\n");
o->verify = VERIFY_NONE;
return 1;
}
+ if (!o->timeout && o->time_based) {
+ log_err("fio: time_based requires a runtime/timeout setting\n");
+ o->time_based = 0;
+ }
+
return 0;
}
FILE *f;
char *p;
int ret = 0, stonewall;
+ int first_sect = 1;
f = fopen(file, "r");
if (!f) {
}
string = malloc(4096);
- name = malloc(256);
- memset(name, 0, 256);
+
+ /*
+ * it's really 256 + small bit, 280 should suffice
+ */
+ name = malloc(280);
+ memset(name, 0, 280);
stonewall = stonewall_flag;
do {
if (is_empty_or_comment(p))
continue;
if (sscanf(p, "[%255s]", name) != 1) {
- log_err("fio: option <%s> outside of job section\n", p);
- continue;
+ log_err("fio: option <%s> outside of [] job section\n", p);
+ break;
}
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
if (dump_cmdline) {
- log_info("fio ");
+ if (first_sect)
+ log_info("fio ");
if (!global)
log_info("--name=%s ", name);
+ first_sect = 0;
}
td = get_new_job(global, &def_thread);
{
memset(&def_thread, 0, sizeof(def_thread));
- if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
- perror("sched_getaffinity");
- return 1;
- }
+ fio_getaffinity(getpid(), &def_thread.o.cpumask);
/*
* fill default options
def_thread.o.write_bw_log = write_bw_log;
def_thread.o.write_lat_log = write_lat_log;
-#ifdef FIO_HAVE_DISK_UTIL
- def_thread.o.do_disk_util = 1;
-#endif
-
return 0;
}
case 's':
dump_cmdline = 1;
break;
+ case 'r':
+ read_only = 1;
+ break;
case 'v':
printf("%s\n", fio_version_string);
exit(0);
td = NULL;
}
if (!td) {
- int global = !strncmp(val, "global", 6);
+ int global = 0;
+
+ if (strncmp(opt, "name", 4) ||
+ !strncmp(val, "global", 6))
+ global = 1;
td = get_new_job(global, &def_thread);
if (!td)