projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add version 2 of the iolog format
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 1e69ce4228c624f3775a95e3299bde84c1e0baef..16e19c8fa8e080511c6e07c96691c809e8955b0a 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-731,7
+731,7
@@
static int keep_running(struct thread_data *td)
return 1;
}
return 1;
}
- io_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
+ io_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE]
+ td->io_skip_bytes
;
if (io_done < td->o.size)
return 1;
if (io_done < td->o.size)
return 1;
@@
-753,7
+753,8
@@
static int clear_io_state(struct thread_data *td)
td->last_was_sync = 0;
td->last_was_sync = 0;
- td->nr_done_files = 0;
+ if (td->o.time_based)
+ td->nr_done_files = 0;
for_each_file(td, f, i)
td_io_close_file(td, f);
for_each_file(td, f, i)
td_io_close_file(td, f);
@@
-920,8
+921,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);
@@
-936,6
+935,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;