Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 9ed802a99228eab56f275933a42d08ee68d33cf6..57ce725be06757df2358e45bcabaaf4cff619573 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] = {
@@ -108,8 +109,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
@@ -303,6 +306,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");