X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=c6e9ce215b9c2e6ecb077ac61aa0d170cc05ff8e;hb=cca84643cc10cd72b0b453ff92ccb8643ba51493;hp=4783238ba7e77c1b77e668bd60385948224db1bc;hpb=c28e8e8c68f7e908085f4585299e6e4d74d01837;p=fio.git

diff --git a/server.h b/server.h
index 4783238b..c6e9ce21 100644
--- 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
@@ -26,25 +26,30 @@ struct fio_net_cmd {
 };
 
 enum {
-	FIO_SERVER_VER		= 1,
-	FIO_SERVER_VER1		= 1,
+	FIO_SERVER_VER		= 3,
+	FIO_SERVER_VER3		= 3,
 
-	FIO_SERVER_MAX_PDU	= 64,
+	FIO_SERVER_MAX_PDU	= 1024,
 
 	FIO_NET_CMD_QUIT	= 1,
 	FIO_NET_CMD_EXIT	= 2,
 	FIO_NET_CMD_JOB		= 3,
-	FIO_NET_CMD_TEXT	= 4,
-	FIO_NET_CMD_TS		= 5,
-	FIO_NET_CMD_GS		= 6,
-	FIO_NET_CMD_ETA		= 7,
-	FIO_NET_CMD_PROBE	= 8,
+	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 {
@@ -54,9 +59,17 @@ 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;
+	uint8_t os;
+	uint8_t arch;
+};
+
+struct cmd_line_pdu {
+	uint16_t argc;
+	uint8_t argv[FIO_NET_CMD_JOBLINE_ARGV][64];
 };
 
 extern int fio_start_server(int);
@@ -64,6 +77,8 @@ extern int fio_server_text_output(const char *, unsigned int len);
 extern int fio_server_log(const char *format, ...);
 extern int fio_net_send_cmd(int, uint16_t, const void *, off_t);
 extern int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial);
+extern void fio_server_set_arg(const char *);
+extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *);
 
 struct thread_stat;
 struct group_run_stats;
@@ -75,7 +90,8 @@ extern void fio_server_idle_loop(void);
 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 int fio_client_add(const char *, void **);
+extern int fio_client_add_cmd_option(void *, 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);
@@ -85,55 +101,12 @@ extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 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)
 {
 	memset(cmd, 0, sizeof(*cmd));
 
-	cmd->version	= __cpu_to_le16(FIO_SERVER_VER1);
+	cmd->version	= __cpu_to_le16(FIO_SERVER_VER3);
 	cmd->opcode	= cpu_to_le16(opcode);
 
 	if (pdu) {