Add exit_on_io_done option to the CPU IO engine

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 37e5c0db5a6e32fd67b6bd1f24addf4d73066f88..3fde492c91af727f6d96abf39c308d3ca4b657c7 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -31,6 +31,7 @@
 #include "fio.h"
 #include "smalloc.h"
 #include "os/os.h"
+#include "filelock.h"
 
 /*
  * Just expose an empty list, if the OS does not support disk util stats
@@ -41,8 +42,8 @@ FLIST_HEAD(disk_list);
 
 unsigned long arch_flags = 0;
 
-uintptr_t page_mask;
-uintptr_t page_size;
+uintptr_t page_mask = 0;
+uintptr_t page_size = 0;
 
 static const char *fio_os_strings[os_nr] = {
        "Invalid",
@@ -52,8 +53,10 @@ static const char *fio_os_strings[os_nr] = {
        "HP-UX",
        "OSX",
        "NetBSD",
+       "OpenBSD",
        "Solaris",
-       "Windows"
+       "Windows",
+       "Android",
 };
 
 static const char *fio_arch_strings[arch_nr] = {
@@ -83,7 +86,6 @@ 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;
 
@@ -127,11 +129,14 @@ void reset_all_stats(struct thread_data *td)
                td->io_issues[i] = 0;
                td->ts.total_io_u[i] = 0;
                td->ts.runtime[i] = 0;
+               td->rwmix_issues = 0;
        }
 
        fio_gettime(&tv, NULL);
        memcpy(&td->epoch, &tv, sizeof(tv));
        memcpy(&td->start, &tv, sizeof(tv));
+
+       lat_target_reset(td);
 }
 
 void reset_fio_state(void)
@@ -168,6 +173,19 @@ void td_set_runstate(struct thread_data *td, int runstate)
        td->runstate = runstate;
 }
 
+int td_bump_runstate(struct thread_data *td, int new_state)
+{
+       int old_state = td->runstate;
+
+       td_set_runstate(td, new_state);
+       return old_state;
+}
+
+void td_restore_runstate(struct thread_data *td, int old_state)
+{
+       td_set_runstate(td, old_state);
+}
+
 void fio_terminate_threads(int group_id)
 {
        struct thread_data *td;
@@ -200,6 +218,21 @@ void fio_terminate_threads(int group_id)
        }
 }
 
+int fio_running_or_pending_io_threads(void)
+{
+       struct thread_data *td;
+       int i;
+
+       for_each_td(td, i) {
+               if (td->flags & TD_F_NOIO)
+                       continue;
+               if (td->runstate < TD_EXITED)
+                       return 1;
+       }
+
+       return 0;
+}
+
 static int endian_check(void)
 {
        union {
@@ -240,10 +273,19 @@ int initialize_fio(char *envp[])
                return 1;
        }
 
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
+
        arch_init(envp);
 
        sinit();
 
+       if (fio_filelock_init()) {
+               log_err("fio: failed initializing filelock subsys\n");
+               return 1;
+       }
+
        /*
         * We need locale for number printing, if it isn't set then just
         * go with the US format.