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 9ed802a99228eab56f275933a42d08ee68d33cf6..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
@@ -58,6 +59,7 @@ static const char *fio_os_strings[os_nr] = {
        "Solaris",
        "Windows",
        "Android",
+       "DragonFly",
 };
 
 static const char *fio_arch_strings[arch_nr] = {
@@ -76,18 +78,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;
+       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;
@@ -100,21 +108,24 @@ 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)
+       for_each_file(td, f, i) {
                fio_file_clear_done(f);
+               f->file_offset = get_start_offset(td, f);
+       }
 
        /*
-        * Set the same seed to get repeatable runs
+        * Re-Seed random number generator if rand_repeatable is true
         */
-       td_fill_rand_seeds(td);
+       if (td->o.rand_repeatable)
+               td_fill_rand_seeds(td);
 }
 
 void reset_all_stats(struct thread_data *td)
@@ -122,7 +133,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;
@@ -136,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)
@@ -164,13 +179,38 @@ const char *fio_get_arch_string(int nr)
        return NULL;
 }
 
+static const char *td_runstates[] = {
+       "NOT_CREATED",
+       "CREATED",
+       "INITIALIZED",
+       "RAMP",
+       "SETTING_UP",
+       "RUNNING",
+       "PRE_READING",
+       "VERIFYING",
+       "FSYNCING",
+       "FINISHING",
+       "EXITED",
+       "REAPED",
+};
+
+const char *runstate_to_name(int runstate)
+{
+       compiletime_assert(TD_LAST == 12, "td runstate list");
+       if (runstate >= 0 && runstate < TD_LAST)
+               return td_runstates[runstate];
+
+       return "invalid";
+}
+
 void td_set_runstate(struct thread_data *td, int runstate)
 {
        if (td->runstate == runstate)
                return;
 
-       dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", (int) td->pid,
-                                               td->runstate, runstate);
+       dprint(FD_PROCESS, "pid=%d: runstate %s -> %s\n", (int) td->pid,
+                                               runstate_to_name(td->runstate),
+                                               runstate_to_name(runstate));
        td->runstate = runstate;
 }
 
@@ -194,7 +234,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();
@@ -203,7 +243,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);
 
@@ -234,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;
 }
 
@@ -303,6 +347,8 @@ int initialize_fio(char *envp[])
         * access (ARM).
         */
        compiletime_assert((offsetof(struct thread_stat, percentile_list) % 8) == 0, "stat percentile_list");
+       compiletime_assert((offsetof(struct thread_stat, total_run_time) % 8) == 0, "total_run_time");
+       compiletime_assert((offsetof(struct thread_stat, total_err_count) % 8) == 0, "total_err_count");
        compiletime_assert((offsetof(struct thread_stat, latency_percentile) % 8) == 0, "stat latency_percentile");
        compiletime_assert((offsetof(struct thread_options_pack, zipf_theta) % 8) == 0, "zipf_theta");
        compiletime_assert((offsetof(struct thread_options_pack, pareto_h) % 8) == 0, "pareto_h");
@@ -347,3 +393,8 @@ int initialize_fio(char *envp[])
        fio_keywords_init();
        return 0;
 }
+
+void deinitialize_fio(void)
+{
+       fio_keywords_exit();
+}