static void reset_io_counters(struct thread_data *td)
{
- td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0;
- td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
- td->stat_io_blocks[0] = td->stat_io_blocks[1] = 0;
- td->this_io_blocks[0] = td->this_io_blocks[1] = 0;
+ int ddir;
+
+ for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
+ td->stat_io_bytes[ddir] = 0;
+ td->this_io_bytes[ddir] = 0;
+ td->stat_io_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->rate_bytes[0] = td->rate_bytes[1] = 0;
- td->rate_blocks[0] = td->rate_blocks[1] = 0;
td->last_was_sync = 0;
+ td->rwmix_issues = 0;
/*
* 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;
}
reset_io_counters(td);
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
td->io_bytes[i] = 0;
td->io_blocks[i] = 0;
td->io_issues[i] = 0;
td->ts.total_io_u[i] = 0;
+ td->ts.runtime[i] = 0;
}
fio_gettime(&tv, NULL);
- td->ts.runtime[0] = 0;
- td->ts.runtime[1] = 0;
memcpy(&td->epoch, &tv, sizeof(tv));
memcpy(&td->start, &tv, sizeof(tv));
}
{
groupid = 0;
thread_number = 0;
+ stat_number = 0;
nr_process = 0;
nr_thread = 0;
done_secs = 0;
void fio_terminate_threads(int group_id)
{
struct thread_data *td;
+ pid_t pid = getpid();
int i;
dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
/*
* 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);
else {
struct ioengine_ops *ops = td->io_ops;
- if (ops && (ops->flags & FIO_SIGTERM))
- kill(td->pid, SIGTERM);
+ if (ops && ops->terminate)
+ ops->terminate(td);
}
}
}