Be more verbose on endianness detection failure

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 0f9f4e751b7476760049a73e3c5650a5e097ff1d..7e0d32c37d4bc345a0f5f95c03c57598536637d5 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -152,6 +152,7 @@ void reset_all_stats(struct thread_data *td)
        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);
@@ -310,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 {
@@ -326,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;
 }
@@ -343,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
@@ -358,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;
        }