client: ensure that cmd line arguments are always run

[fio.git] / server.h

diff --git a/server.h b/server.h
index 98262af85679c4724116cf0f34076ae7cc949d1d..3d1d79c3c8cd2a0c7d3f1eed8e154b48263b1767 100644 (file)
--- a/server.h
+++ b/server.h
@@ -3,9 +3,9 @@
 
 #include <inttypes.h>
 #include <string.h>
-#include <endian.h>
 
 #include "stat.h"
+#include "os/os.h"
 
 /*
  * On-wire encoding is little endian
@@ -59,6 +59,7 @@ struct cmd_ts_pdu {
 
 struct cmd_probe_pdu {
        uint8_t hostname[64];
+       uint8_t bigendian;
        uint8_t fio_major;
        uint8_t fio_minor;
        uint8_t fio_patch;
@@ -86,7 +87,7 @@ extern int fio_clients_connect(void);
 extern int fio_clients_send_ini(const char *);
 extern int fio_handle_clients(void);
 extern void fio_client_add(const char *);
-extern void fio_client_add_cmd_option(const char *, const char *);
+extern int fio_client_add_cmd_option(const char *, const char *);
 
 extern int fio_recv_data(int sk, void *p, unsigned int len);
 extern int fio_send_data(int sk, const void *p, unsigned int len);
@@ -96,49 +97,6 @@ extern struct fio_net_cmd *fio_net_recv_cmd(int sk, int block);
 extern int exit_backend;
 extern int fio_net_port;
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define __le16_to_cpu(x)               (x)
-#define __le32_to_cpu(x)               (x)
-#define __le64_to_cpu(x)               (x)
-#define __cpu_to_le16(x)               (x)
-#define __cpu_to_le32(x)               (x)
-#define __cpu_to_le64(x)               (x)
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#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)
-#else
-#error "Endianness not detected"
-#endif
-
-#define le16_to_cpu(val) ({                    \
-       uint16_t *__val = &(val);               \
-       __le16_to_cpu(*__val);                  \
-})
-#define le32_to_cpu(val) ({                    \
-       uint32_t *__val = &(val);               \
-       __le32_to_cpu(*__val);                  \
-})
-#define le64_to_cpu(val) ({                    \
-       uint64_t *__val = &(val);               \
-       __le64_to_cpu(*__val);                  \
-})
-#define cpu_to_le16(val) ({                    \
-       uint16_t *__val = &(val);               \
-       __cpu_to_le16(*__val);                  \
-})
-#define cpu_to_le32(val) ({                    \
-       uint32_t *__val = &(val);               \
-       __cpu_to_le32(*__val);                  \
-})
-#define cpu_to_le64(val) ({                    \
-       uint64_t *__val = &(val);               \
-       __cpu_to_le64(*__val);                  \
-})
-
 static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
                                    const void *pdu, uint32_t pdu_len)
 {