projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for splitting the verify_header from the checksum header
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 6e0dae24d5cf0e8410c0b04e2d25856b7839b8b2..b8cba547ac931fcdf7ac0b3af79b7b19a7b8af75 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-446,6
+446,13
@@
static void do_io(struct thread_data *td)
break;
}
break;
}
+ /*
+ * Add verification end_io handler, if asked to verify
+ * a previously written file.
+ */
+ if (td->o.verify != VERIFY_NONE)
+ io_u->end_io = verify_io_u;
+
ret = td_io_queue(td, io_u);
switch (ret) {
case FIO_Q_COMPLETED:
ret = td_io_queue(td, io_u);
switch (ret) {
case FIO_Q_COMPLETED:
@@
-724,6
+731,8
@@
static int keep_running(struct thread_data *td)
{
unsigned long long io_done;
{
unsigned long long io_done;
+ if (td->done)
+ return 0;
if (td->o.time_based)
return 1;
if (td->o.loops) {
if (td->o.time_based)
return 1;
if (td->o.loops) {
@@
-892,7
+901,8
@@
static void *thread_main(void *data)
if (td->error || td->terminate)
break;
if (td->error || td->terminate)
break;
- if (td->o.verify == VERIFY_NONE)
+ if (td->o.verify == VERIFY_NONE ||
+ (td->io_ops->flags & FIO_UNIDIR))
continue;
if (clear_io_state(td))
continue;
if (clear_io_state(td))
@@
-909,8
+919,8
@@
static void *thread_main(void *data)
}
update_rusage_stat(td);
}
update_rusage_stat(td);
- td->ts.runtime[0] =
runtime[0]
/ 1000;
- td->ts.runtime[1] =
runtime[1]
/ 1000;
+ td->ts.runtime[0] =
(runtime[0] + 999)
/ 1000;
+ td->ts.runtime[1] =
(runtime[1] + 999)
/ 1000;
td->ts.total_run_time = mtime_since_now(&td->epoch);
td->ts.io_bytes[0] = td->io_bytes[0];
td->ts.io_bytes[1] = td->io_bytes[1];
td->ts.total_run_time = mtime_since_now(&td->epoch);
td->ts.io_bytes[0] = td->io_bytes[0];
td->ts.io_bytes[1] = td->io_bytes[1];
@@
-921,8
+931,6
@@
static void *thread_main(void *data)
finish_log(td, td->ts.slat_log, "slat");
if (td->ts.clat_log)
finish_log(td, td->ts.clat_log, "clat");
finish_log(td, td->ts.slat_log, "slat");
if (td->ts.clat_log)
finish_log(td, td->ts.clat_log, "clat");
- if (td->o.write_iolog_file)
- write_iolog_close(td);
if (td->o.exec_postrun) {
if (system(td->o.exec_postrun) < 0)
log_err("fio: postrun %s failed\n", td->o.exec_postrun);
if (td->o.exec_postrun) {
if (system(td->o.exec_postrun) < 0)
log_err("fio: postrun %s failed\n", td->o.exec_postrun);
@@
-937,6
+945,13
@@
err:
close_files(td);
close_ioengine(td);
cleanup_io_u(td);
close_files(td);
close_ioengine(td);
cleanup_io_u(td);
+
+ /*
+ * do this very late, it will log file closing as well
+ */
+ if (td->o.write_iolog_file)
+ write_iolog_close(td);
+
options_mem_free(td);
td_set_runstate(td, TD_EXITED);
return (void *) (unsigned long) td->error;
options_mem_free(td);
td_set_runstate(td, TD_EXITED);
return (void *) (unsigned long) td->error;