server: fix sk typo and add endian type to probe

[fio.git] / server.h

diff --git a/server.h b/server.h
index 61b61f35d4df1f9b4153ac6bb53829916206d7d8..fe762c94eb39f625e04f702648f9532c796d5957 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
@@ -34,18 +34,22 @@ enum {
        FIO_NET_CMD_QUIT        = 1,
        FIO_NET_CMD_EXIT        = 2,
        FIO_NET_CMD_JOB         = 3,
-       FIO_NET_CMD_ACK         = 4,
-       FIO_NET_CMD_NAK         = 5,
-       FIO_NET_CMD_TEXT        = 6,
-       FIO_NET_CMD_TS          = 7,
-       FIO_NET_CMD_GS          = 8,
-       FIO_NET_CMD_ETA         = 9,
+       FIO_NET_CMD_JOBLINE     = 4,
+       FIO_NET_CMD_TEXT        = 5,
+       FIO_NET_CMD_TS          = 6,
+       FIO_NET_CMD_GS          = 7,
+       FIO_NET_CMD_ETA         = 8,
+       FIO_NET_CMD_PROBE       = 9,
+       FIO_NET_CMD_START       = 10,
+       FIO_NET_CMD_STOP        = 11,
 
        FIO_NET_CMD_F_MORE      = 1UL << 0,
 
        /* crc does not include the crc fields */
        FIO_NET_CMD_CRC_SZ      = sizeof(struct fio_net_cmd) -
                                        2 * sizeof(uint16_t),
+
+       FIO_NET_CMD_JOBLINE_ARGV        = 128,
 };
 
 struct cmd_ts_pdu {
@@ -53,6 +57,19 @@ struct cmd_ts_pdu {
        struct group_run_stats rs;
 };
 
+struct cmd_probe_pdu {
+       uint8_t hostname[64];
+       uint8_t bigendian;
+       uint8_t fio_major;
+       uint8_t fio_minor;
+       uint8_t fio_patch;
+};
+
+struct cmd_line_pdu {
+       uint16_t argc;
+       uint8_t argv[FIO_NET_CMD_JOBLINE_ARGV][64];
+};
+
 extern int fio_start_server(int);
 extern int fio_server_text_output(const char *, unsigned int len);
 extern int fio_server_log(const char *format, ...);
@@ -70,31 +87,30 @@ 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_recv_data(int sk, void *p, unsigned int len);
 extern int fio_send_data(int sk, const void *p, unsigned int len);
 extern void fio_net_cmd_crc(struct fio_net_cmd *);
-extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
+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
+#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)
-#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"
+#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) ({                    \