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;
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->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;
}
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);
}
}
}