Loop Iteration Offset Bug

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 3fde492c91af727f6d96abf39c308d3ca4b657c7..b823bd4779bfed19b1ae0c544a52eb79f17ebcd6 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -27,6 +27,7 @@
 #include <signal.h>
 #include <stdint.h>
 #include <locale.h>
+#include <fcntl.h>
 
 #include "fio.h"
 #include "smalloc.h"
@@ -107,8 +108,10 @@ 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
@@ -186,6 +189,13 @@ void td_restore_runstate(struct thread_data *td, int old_state)
        td_set_runstate(td, old_state);
 }
 
+void fio_mark_td_terminate(struct thread_data *td)
+{
+       fio_gettime(&td->terminate_time, NULL);
+       write_barrier();
+       td->terminate = 1;
+}
+
 void fio_terminate_threads(int group_id)
 {
        struct thread_data *td;
@@ -198,7 +208,11 @@ void fio_terminate_threads(int group_id)
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
                        dprint(FD_PROCESS, "setting terminate on %s/%d\n",
                                                td->o.name, (int) td->pid);
-                       td->terminate = 1;
+
+                       if (td->terminate)
+                               continue;
+
+                       fio_mark_td_terminate(td);
                        td->o.start_delay = 0;
 
                        /*
@@ -233,6 +247,24 @@ int fio_running_or_pending_io_threads(void)
        return 0;
 }
 
+int fio_set_fd_nonblocking(int fd, const char *who)
+{
+       int flags;
+
+       flags = fcntl(fd, F_GETFL);
+       if (flags < 0)
+               log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno));
+       else {
+               int new_flags = flags | O_NONBLOCK;
+
+               new_flags = fcntl(fd, F_SETFL, new_flags);
+               if (new_flags < 0)
+                       log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno));
+       }
+
+       return flags;
+}
+
 static int endian_check(void)
 {
        union {
@@ -267,6 +299,18 @@ int initialize_fio(char *envp[])
 {
        long ps;
 
+       /*
+        * We need these to be properly 64-bit aligned, otherwise we
+        * can run into problems on archs that fault on unaligned fp
+        * access (ARM).
+        */
+       compiletime_assert((offsetof(struct thread_stat, percentile_list) % 8) == 0, "stat percentile_list");
+       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");
+       compiletime_assert((offsetof(struct thread_options_pack, percentile_list) % 8) == 0, "percentile_list");
+       compiletime_assert((offsetof(struct thread_options_pack, latency_percentile) % 8) == 0, "latency_percentile");
+
        if (endian_check()) {
                log_err("fio: endianness settings appear wrong.\n");
                log_err("fio: please report this to fio@vger.kernel.org\n");