X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=libfio.c;h=ac629dcbb7943a0f7f0f98c21e6a5885ee05d32d;hp=43e1a61aad8abbf217da11125ac6818defaaa2c8;hb=4b919f7740f4875d73c0619a08d269d5c679e19f;hpb=6eaf09d6e9ca1f8accb057cdb18620b7e53ae33f

diff --git a/libfio.c b/libfio.c
index 43e1a61a..ac629dcb 100644
--- 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;
+
 	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->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;
 }
 
@@ -127,6 +130,7 @@ void reset_fio_state(void)
 {
 	groupid = 0;
 	thread_number = 0;
+	stat_number = 0;
 	nr_process = 0;
 	nr_thread = 0;
 	done_secs = 0;
@@ -161,6 +165,7 @@ void td_set_runstate(struct thread_data *td, int runstate)
 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);
@@ -175,15 +180,15 @@ void fio_terminate_threads(int 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);
 			}
 		}
 	}