libfio: add runstate names

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 9ed802a99228eab56f275933a42d08ee68d33cf6..b0141a7524e2c3d5c18d7f8e14c1503710c73363 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -58,6 +58,7 @@ static const char *fio_os_strings[os_nr] = {
        "Solaris",
        "Windows",
        "Android",
+       "DragonFly",
 };
 
 static const char *fio_arch_strings[arch_nr] = {
@@ -87,6 +88,7 @@ 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->bytes_done[ddir] = 0;
        }
        td->zone_bytes = 0;
 
@@ -108,13 +110,16 @@ void clear_io_state(struct thread_data *td)
        reset_io_counters(td);
 
        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)
@@ -164,13 +169,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",
+};
+
+static 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;
 }
 
@@ -303,6 +333,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 +379,8 @@ int initialize_fio(char *envp[])
        fio_keywords_init();
        return 0;
 }
+
+void deinitialize_fio(void)
+{
+       fio_keywords_exit();
+}