Ignore exit_io_done= option if no I/O threads are configured

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 3aa52e0a592e3537de5e6d57652b1f9f1d3997cd..25866758be9fac27001fdf9715e47f36fa6779dd 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -33,6 +33,7 @@
 #include "smalloc.h"
 #include "os/os.h"
 #include "filelock.h"
+#include "helper_thread.h"
 
 /*
  * Just expose an empty list, if the OS does not support disk util stats
@@ -146,8 +147,12 @@ void reset_all_stats(struct thread_data *td)
        fio_gettime(&tv, NULL);
        memcpy(&td->epoch, &tv, sizeof(tv));
        memcpy(&td->start, &tv, sizeof(tv));
+       memcpy(&td->iops_sample_time, &tv, sizeof(tv));
+       memcpy(&td->bw_sample_time, &tv, sizeof(tv));
 
        lat_target_reset(td);
+       clear_rusage_stat(td);
+       helper_reset();
 }
 
 void reset_fio_state(void)
@@ -189,7 +194,7 @@ static const char *td_runstates[] = {
        "REAPED",
 };
 
-static const char *runstate_to_name(int runstate)
+const char *runstate_to_name(int runstate)
 {
        compiletime_assert(TD_LAST == 12, "td runstate list");
        if (runstate >= 0 && runstate < TD_LAST)
@@ -269,14 +274,18 @@ int fio_running_or_pending_io_threads(void)
 {
        struct thread_data *td;
        int i;
+       int nr_io_threads = 0;
 
        for_each_td(td, i) {
                if (td->flags & TD_F_NOIO)
                        continue;
+               nr_io_threads++;
                if (td->runstate < TD_EXITED)
                        return 1;
        }
 
+       if (!nr_io_threads)
+               return -1; /* we only had cpuio threads to begin with */
        return 0;
 }