Fix typo in alignment check

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 8af11297e17c5eed31bd3e23df72ed40c1bfab25..9ed802a99228eab56f275933a42d08ee68d33cf6 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -187,6 +187,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;
@@ -199,7 +206,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;
 
                        /*
@@ -286,6 +297,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");