Be more verbose on endianness detection failure

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 790c0364b493f77606171ac6b6e399d110c140bf..7e0d32c37d4bc345a0f5f95c03c57598536637d5 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -33,6 +33,8 @@
 #include "smalloc.h"
 #include "os/os.h"
 #include "filelock.h"
+#include "helper_thread.h"
+#include "filehash.h"
 
 /*
  * Just expose an empty list, if the OS does not support disk util stats
@@ -46,6 +48,7 @@ unsigned long arch_flags = 0;
 uintptr_t page_mask = 0;
 uintptr_t page_size = 0;
 
+/* see os/os.h */
 static const char *fio_os_strings[os_nr] = {
        "Invalid",
        "Linux",
@@ -61,6 +64,7 @@ static const char *fio_os_strings[os_nr] = {
        "DragonFly",
 };
 
+/* see arch/arch.h */
 static const char *fio_arch_strings[arch_nr] = {
        "Invalid",
        "x86-64",
@@ -74,6 +78,8 @@ static const char *fio_arch_strings[arch_nr] = {
        "arm",
        "sh",
        "hppa",
+       "mips",
+       "aarch64",
        "generic"
 };
 
@@ -129,7 +135,6 @@ void clear_io_state(struct thread_data *td, int all)
 
 void reset_all_stats(struct thread_data *td)
 {
-       struct timeval tv;
        int i;
 
        reset_io_counters(td, 1);
@@ -143,11 +148,11 @@ void reset_all_stats(struct thread_data *td)
                td->rwmix_issues = 0;
        }
 
-       fio_gettime(&tv, NULL);
-       memcpy(&td->epoch, &tv, sizeof(tv));
-       memcpy(&td->start, &tv, sizeof(tv));
-       memcpy(&td->iops_sample_time, &tv, sizeof(tv));
-       memcpy(&td->bw_sample_time, &tv, sizeof(tv));
+       set_epoch_time(td, td->o.log_unix_epoch);
+       memcpy(&td->start, &td->epoch, sizeof(struct timeval));
+       memcpy(&td->iops_sample_time, &td->epoch, sizeof(struct timeval));
+       memcpy(&td->bw_sample_time, &td->epoch, sizeof(struct timeval));
+       memcpy(&td->ss.prev_time, &td->epoch, sizeof(struct timeval));
 
        lat_target_reset(td);
        clear_rusage_stat(td);
@@ -273,14 +278,18 @@ int fio_running_or_pending_io_threads(void)
 {
        struct thread_data *td;
        int i;
+       int nr_io_threads = 0;
 
        for_each_td(td, i) {
                if (td->flags & TD_F_NOIO)
                        continue;
+               nr_io_threads++;
                if (td->runstate < TD_EXITED)
                        return 1;
        }
 
+       if (!nr_io_threads)
+               return -1; /* we only had cpuio threads to begin with */
        return 0;
 }
 
@@ -302,6 +311,13 @@ int fio_set_fd_nonblocking(int fd, const char *who)
        return flags;
 }
 
+enum {
+       ENDIAN_INVALID_BE = 1,
+       ENDIAN_INVALID_LE,
+       ENDIAN_INVALID_CONFIG,
+       ENDIAN_BROKEN,
+};
+
 static int endian_check(void)
 {
        union {
@@ -318,16 +334,16 @@ static int endian_check(void)
 
 #if defined(CONFIG_LITTLE_ENDIAN)
        if (be)
-               return 1;
+               return ENDIAN_INVALID_BE;
 #elif defined(CONFIG_BIG_ENDIAN)
        if (le)
-               return 1;
+               return ENDIAN_INVALID_LE;
 #else
-       return 1;
+       return ENDIAN_INVALID_CONFIG;
 #endif
 
        if (!le && !be)
-               return 1;
+               return ENDIAN_BROKEN;
 
        return 0;
 }
@@ -335,6 +351,7 @@ static int endian_check(void)
 int initialize_fio(char *envp[])
 {
        long ps;
+       int err;
 
        /*
         * We need these to be properly 64-bit aligned, otherwise we
@@ -350,8 +367,26 @@ int initialize_fio(char *envp[])
        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()) {
+       err = endian_check();
+       if (err) {
                log_err("fio: endianness settings appear wrong.\n");
+               switch (err) {
+               case ENDIAN_INVALID_BE:
+                       log_err("fio: got big-endian when configured for little\n");
+                       break;
+               case ENDIAN_INVALID_LE:
+                       log_err("fio: got little-endian when configured for big\n");
+                       break;
+               case ENDIAN_INVALID_CONFIG:
+                       log_err("fio: not configured to any endianness\n");
+                       break;
+               case ENDIAN_BROKEN:
+                       log_err("fio: failed to detect endianness\n");
+                       break;
+               default:
+                       assert(0);
+                       break;
+               }
                log_err("fio: please report this to fio@vger.kernel.org\n");
                return 1;
        }
@@ -369,6 +404,8 @@ int initialize_fio(char *envp[])
                return 1;
        }
 
+       file_hash_init();
+
        /*
         * We need locale for number printing, if it isn't set then just
         * go with the US format.