projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disk stat improvements
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 0151c9bd4b2979626e17c592c76938c9e2b68b35..1e4432ec7131f4f4e850761a9475bf914be3b05a 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-17,7
+17,7
@@
#include "fio.h"
#include "parse.h"
#include "fio.h"
#include "parse.h"
-static char fio_version_string[] = "fio 1.1
5.1
";
+static char fio_version_string[] = "fio 1.1
6
";
#define FIO_RANDSEED (0xb1899bedUL)
#define FIO_RANDSEED (0xb1899bedUL)
@@
-274,6
+274,11
@@
static int fixup_options(struct thread_data *td)
return 1;
}
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;
}
return 0;
}
@@
-427,6
+432,13
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (fixup_options(td))
goto err;
if (fixup_options(td))
goto err;
+ if (td->io_ops->flags & FIO_DISKLESSIO) {
+ struct fio_file *f;
+
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
+ }
+
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
@@
-543,6
+555,7
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
FILE *f;
char *p;
int ret = 0, stonewall;
FILE *f;
char *p;
int ret = 0, stonewall;
+ int first_sect = 1;
f = fopen(file, "r");
if (!f) {
f = fopen(file, "r");
if (!f) {
@@
-575,9
+588,11
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
name[strlen(name) - 1] = '\0';
if (dump_cmdline) {
name[strlen(name) - 1] = '\0';
if (dump_cmdline) {
- log_info("fio ");
+ if (first_sect)
+ log_info("fio ");
if (!global)
log_info("--name=%s ", name);
if (!global)
log_info("--name=%s ", name);
+ first_sect = 0;
}
td = get_new_job(global, &def_thread);
}
td = get_new_job(global, &def_thread);
@@
-654,10
+669,6
@@
static int fill_def_thread(void)
def_thread.o.write_bw_log = write_bw_log;
def_thread.o.write_lat_log = write_lat_log;
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;
}
return 0;
}
@@
-775,7
+786,11
@@
static int parse_cmd_line(int argc, char *argv[])
td = NULL;
}
if (!td) {
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)
td = get_new_job(global, &def_thread);
if (!td)