Wider endianness support

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/os-linux.h b/os/os-linux.h
index 8d3b97ea1f04015af100c990aba4d50914f99df9..2599091b7fd41d8fbf6efdff0ee6190dfe6e9034 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -295,6 +295,10 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 #error "Unknown endianness"
 #endif
 
 #error "Unknown endianness"
 #endif
 

+#define fio_swap16(x)  __bswap_16(x)
+#define fio_swap32(x)  __bswap_32(x)
+#define fio_swap64(x)  __bswap_64(x)
+

 #define CACHE_LINE_FILE        \
        "/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
 
 #define CACHE_LINE_FILE        \
        "/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
 

diff --git a/os/os-mac.h b/os/os-mac.h
index eb55cd7742fa4a7dee86e5122273f2a33362608c..24e0eb5d157b8db0c292bd15fb1b3a6508e28981 100644 (file)
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -9,6 +9,8 @@
 #include <unistd.h>
 #include <signal.h>
 #include <mach/mach_init.h>
 #include <unistd.h>
 #include <signal.h>
 #include <mach/mach_init.h>

+#include <machine/endian.h>
+#include <libkern/OSByteOrder.h>

 
 #include "../file.h"
 
 
 #include "../file.h"
 


@@ -28,6 +30,18 @@
 
 #define OS_MAP_ANON            MAP_ANON
 
 
 #define OS_MAP_ANON            MAP_ANON
 

+#if defined(__LITTLE_ENDIAN__)
+#define FIO_LITTLE_ENDIAN
+#elif defined(__BIG_ENDIAN__)
+#define FIO_BIG_ENDIAN
+#else
+#error "Undefined byte order"
+#endif
+
+#define fio_swap16(x)  OSSwapInt16(x)
+#define fio_swap32(x)  OSSwapInt32(x)
+#define fio_swap64(x)  OSSwapInt64(x)
+

 /*
  * OSX has a pitifully small shared memory segment by default,
  * so default to a lower number of max jobs supported
 /*
  * OSX has a pitifully small shared memory segment by default,
  * so default to a lower number of max jobs supported

diff --git a/server.h b/server.h
index 3bb96a2777021b64c31ace58bfb652ff41687412..e129ffda8e19b53d805b696f2613eb03e23eadc5 100644 (file)
--- a/server.h
+++ b/server.h
@@ -104,12 +104,12 @@ extern int fio_net_port;
 #define __cpu_to_le32(x)               (x)
 #define __cpu_to_le64(x)               (x)
 #else
 #define __cpu_to_le32(x)               (x)
 #define __cpu_to_le64(x)               (x)
 #else

-#define __le16_to_cpu(x)               __bswap_16(x)
-#define __le32_to_cpu(x)               __bswap_32(x)
-#define __le64_to_cpu(x)               __bswap_64(x)
-#define __cpu_to_le16(x)               __bswap_16(x)
-#define __cpu_to_le32(x)               __bswap_32(x)
-#define __cpu_to_le64(x)               __bswap_64(x)
+#define __le16_to_cpu(x)               fio_swap16(x)
+#define __le32_to_cpu(x)               fio_swap_2(x)
+#define __le64_to_cpu(x)               fio_swap64(x)
+#define __cpu_to_le16(x)               fio_swap16(x)
+#define __cpu_to_le32(x)               fio_swap32(x)
+#define __cpu_to_le64(x)               fio_swap64(x)

 #endif
 
 #define le16_to_cpu(val) ({                    \
 #endif
 
 #define le16_to_cpu(val) ({                    \