Add runstate swap helpers

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 95938c88da4e12e4b3eb8adc9b33e74438be340e..8eddab80b345651f11533038963bb03e5bc0ff93 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -41,8 +41,8 @@ FLIST_HEAD(disk_list);
 
 unsigned long arch_flags = 0;
 
-unsigned long page_mask;
-unsigned long page_size;
+uintptr_t page_mask = 0;
+uintptr_t page_size = 0;
 
 static const char *fio_os_strings[os_nr] = {
        "Invalid",
@@ -52,8 +52,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] = {
@@ -74,20 +76,25 @@ static const char *fio_arch_strings[arch_nr] = {
 
 static void reset_io_counters(struct thread_data *td)
 {
-       td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0;
-       td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
-       td->stat_io_blocks[0] = td->stat_io_blocks[1] = 0;
-       td->this_io_blocks[0] = td->this_io_blocks[1] = 0;
+       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->zone_bytes = 0;
-       td->rate_bytes[0] = td->rate_bytes[1] = 0;
-       td->rate_blocks[0] = td->rate_blocks[1] = 0;
 
        td->last_was_sync = 0;
+       td->rwmix_issues = 0;
 
        /*
         * reset file done count if we are to start over
         */
-       if (td->o.time_based || td->o.loops)
+       if (td->o.time_based || td->o.loops || td->o.do_verify)
                td->nr_done_files = 0;
 }
 
@@ -115,26 +122,27 @@ void reset_all_stats(struct thread_data *td)
 
        reset_io_counters(td);
 
-       for (i = 0; i < 2; i++) {
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                td->io_bytes[i] = 0;
                td->io_blocks[i] = 0;
                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);
-       td->ts.runtime[0] = 0;
-       td->ts.runtime[1] = 0;
        memcpy(&td->epoch, &tv, sizeof(tv));
        memcpy(&td->start, &tv, sizeof(tv));
+
+       lat_target_reset(td);
 }
 
 void reset_fio_state(void)
 {
        groupid = 0;
        thread_number = 0;
-       nr_process = 0;
-       nr_thread = 0;
+       stat_number = 0;
        done_secs = 0;
 }
 
@@ -164,9 +172,23 @@ 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;
+       pid_t pid = getpid();
        int i;
 
        dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
@@ -181,15 +203,15 @@ void fio_terminate_threads(int group_id)
                        /*
                         * if the thread is running, just let it exit
                         */
-                       if (!td->pid)
+                       if (!td->pid || pid == td->pid)
                                continue;
                        else if (td->runstate < TD_RAMP)
                                kill(td->pid, SIGTERM);
                        else {
                                struct ioengine_ops *ops = td->io_ops;
 
-                               if (ops && (ops->flags & FIO_SIGTERM))
-                                       kill(td->pid, SIGTERM);
+                               if (ops && ops->terminate)
+                                       ops->terminate(td);
                        }
                }
        }
@@ -209,10 +231,10 @@ static int endian_check(void)
        else if (u.c[0] == 0x12)
                le = 1;
 
-#if defined(FIO_LITTLE_ENDIAN)
+#if defined(CONFIG_LITTLE_ENDIAN)
        if (be)
                return 1;
-#elif defined(FIO_BIG_ENDIAN)
+#elif defined(CONFIG_BIG_ENDIAN)
        if (le)
                return 1;
 #else
@@ -235,6 +257,10 @@ 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();