Fix group_id != groupid mixup

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index b0141a7524e2c3d5c18d7f8e14c1503710c73363..3aa52e0a592e3537de5e6d57652b1f9f1d3997cd 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -77,19 +77,24 @@ static const char *fio_arch_strings[arch_nr] = {
        "generic"
 };
 
-static void reset_io_counters(struct thread_data *td)
+static void reset_io_counters(struct thread_data *td, int all)
 {
        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->bytes_done[ddir] = 0;
+       if (all) {
+               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->bytes_done[ddir] = 0;
+                       td->rate_io_issue_bytes[ddir] = 0;
+                       td->rate_next_io_time[ddir] = 0;
+               }
        }
+
        td->zone_bytes = 0;
 
        td->last_was_sync = 0;
@@ -102,12 +107,12 @@ static void reset_io_counters(struct thread_data *td)
                td->nr_done_files = 0;
 }
 
-void clear_io_state(struct thread_data *td)
+void clear_io_state(struct thread_data *td, int all)
 {
        struct fio_file *f;
        unsigned int i;
 
-       reset_io_counters(td);
+       reset_io_counters(td, all);
 
        close_files(td);
        for_each_file(td, f, i) {
@@ -127,7 +132,7 @@ void reset_all_stats(struct thread_data *td)
        struct timeval tv;
        int i;
 
-       reset_io_counters(td);
+       reset_io_counters(td, 1);
 
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                td->io_bytes[i] = 0;
@@ -224,7 +229,7 @@ void fio_mark_td_terminate(struct thread_data *td)
        td->terminate = 1;
 }
 
-void fio_terminate_threads(int group_id)
+void fio_terminate_threads(unsigned int group_id)
 {
        struct thread_data *td;
        pid_t pid = getpid();
@@ -233,7 +238,7 @@ void fio_terminate_threads(int group_id)
        dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
 
        for_each_td(td, i) {
-               if (group_id == TERMINATE_ALL || groupid == td->groupid) {
+               if (group_id == TERMINATE_ALL || group_id == td->groupid) {
                        dprint(FD_PROCESS, "setting terminate on %s/%d\n",
                                                td->o.name, (int) td->pid);