projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parse: fix misparse of bs=64k-128k
[fio.git]
/
libfio.c
diff --git
a/libfio.c
b/libfio.c
index ee5a0ead1707f66fc7418c2b0b964d72727912ee..433fee4671559e0f1e4a5ad200770f0166c166fc 100644
(file)
--- a/
libfio.c
+++ b/
libfio.c
@@
-67,6
+67,7
@@
static const char *fio_arch_strings[arch_nr] = {
static void reset_io_counters(struct thread_data *td)
{
int ddir;
static void reset_io_counters(struct thread_data *td)
{
int ddir;
+
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
td->stat_io_bytes[ddir] = 0;
td->this_io_bytes[ddir] = 0;
for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
td->stat_io_bytes[ddir] = 0;
td->this_io_bytes[ddir] = 0;
@@
-74,15
+75,17
@@
static void reset_io_counters(struct thread_data *td)
td->this_io_blocks[ddir] = 0;
td->rate_bytes[ddir] = 0;
td->rate_blocks[ddir] = 0;
td->this_io_blocks[ddir] = 0;
td->rate_bytes[ddir] = 0;
td->rate_blocks[ddir] = 0;
+ td->io_issues[ddir] = 0;
}
td->zone_bytes = 0;
td->last_was_sync = 0;
}
td->zone_bytes = 0;
td->last_was_sync = 0;
+ td->rwmix_issues = 0;
/*
* reset file done count if we are to start over
*/
/*
* reset file done count if we are to start over
*/
- if (td->o.time_based || td->o.loops)
+ if (td->o.time_based || td->o.loops
|| td->o.do_verify
)
td->nr_done_files = 0;
}
td->nr_done_files = 0;
}
@@
-116,6
+119,7
@@
void reset_all_stats(struct thread_data *td)
td->io_issues[i] = 0;
td->ts.total_io_u[i] = 0;
td->ts.runtime[i] = 0;
td->io_issues[i] = 0;
td->ts.total_io_u[i] = 0;
td->ts.runtime[i] = 0;
+ td->rwmix_issues = 0;
}
fio_gettime(&tv, NULL);
}
fio_gettime(&tv, NULL);
@@
-177,15
+181,15
@@
void fio_terminate_threads(int group_id)
/*
* if the thread is running, just let it exit
*/
/*
* if the thread is running, just let it exit
*/
- if (!td->pid)
+ if (!td->pid
|| pid == td->pid
)
continue;
else if (td->runstate < TD_RAMP)
kill(td->pid, SIGTERM);
continue;
else if (td->runstate < TD_RAMP)
kill(td->pid, SIGTERM);
- else
if (pid != td->pid)
{
+ else {
struct ioengine_ops *ops = td->io_ops;
struct ioengine_ops *ops = td->io_ops;
- if (ops &&
(ops->flags & FIO_SIGTERM)
)
-
kill(td->pid, SIGTERM
);
+ if (ops &&
ops->terminate
)
+
ops->terminate(td
);
}
}
}
}
}
}