X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=3d1d79c3c8cd2a0c7d3f1eed8e154b48263b1767;hp=b3976177ffab5078094ba37586dd8cfe113a97a2;hb=c2c9458515bda1f77e25f95122ef6ec8d8cc3ec7;hpb=fd60bf3beb70b15e7fba31bbaea79e53638ccfe9 diff --git a/server.h b/server.h index b3976177..3d1d79c3 100644 --- a/server.h +++ b/server.h @@ -87,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); @@ -97,47 +97,6 @@ extern struct fio_net_cmd *fio_net_recv_cmd(int sk, int block); extern int exit_backend; extern int fio_net_port; -#ifdef FIO_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) -#else -#define __le16_to_cpu(x) fio_swap16(x) -#define __le32_to_cpu(x) fio_swap32(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) ({ \ - 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) {