X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=bc044e9b4772eff159f34225f8019889b9c8a04c;hp=d68cbf52dbbaa3f90f0a8fc283ef79e84b1be57a;hb=5d7793aa2b1dc1044b1918d829a1bcd4c9a19196;hpb=fa2ea806de0d6410320abd97599bc52f5a3e72cc

diff --git a/server.h b/server.h
index d68cbf52..bc044e9b 100644
--- a/server.h
+++ b/server.h
@@ -3,9 +3,14 @@
 
 #include <inttypes.h>
 #include <string.h>
+#include <sys/time.h>
+#include <netinet/in.h>
 
 #include "stat.h"
 #include "os/os.h"
+#include "diskutil.h"
+
+#define FIO_NET_PORT 8765
 
 /*
  * On-wire encoding is little endian
@@ -14,7 +19,7 @@ struct fio_net_cmd {
 	uint16_t version;	/* protocol version */
 	uint16_t opcode;	/* command opcode */
 	uint32_t flags;		/* modifier flags */
-	uint64_t serial;	/* serial number */
+	uint64_t tag;		/* passed back on reply */
 	uint32_t pdu_len;	/* length of post-cmd layload */
 	/*
 	 * These must be immediately before the payload, anything before
@@ -25,28 +30,42 @@ struct fio_net_cmd {
 	uint8_t payload[0];	/* payload */
 };
 
-enum {
-	FIO_SERVER_VER		= 4,
-
-	FIO_SERVER_MAX_PDU	= 1024,
-
-	FIO_NET_CMD_QUIT	= 1,
-	FIO_NET_CMD_EXIT	= 2,
-	FIO_NET_CMD_JOB		= 3,
-	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,
+struct fio_net_int_cmd {
+	struct fio_net_cmd cmd;
+	struct flist_head list;
+	struct timeval tv;
+	uint64_t saved_tag;
+};
 
-	FIO_NET_CMD_F_MORE	= 1UL << 0,
+enum {
+	FIO_SERVER_VER			= 9,
+
+	FIO_SERVER_MAX_PDU		= 1024,
+
+	FIO_NET_CMD_QUIT		= 1,
+	FIO_NET_CMD_EXIT		= 2,
+	FIO_NET_CMD_JOB			= 3,
+	FIO_NET_CMD_JOBLINE		= 4,
+	FIO_NET_CMD_TEXT		= 5,
+	FIO_NET_CMD_TS			= 6,
+	FIO_NET_CMD_GS			= 7,
+	FIO_NET_CMD_SEND_ETA		= 8,
+	FIO_NET_CMD_ETA			= 9,
+	FIO_NET_CMD_PROBE		= 10,
+	FIO_NET_CMD_START		= 11,
+	FIO_NET_CMD_STOP		= 12,
+	FIO_NET_CMD_DU			= 13,
+	FIO_NET_CMD_SERVER_START	= 14,
+	FIO_NET_CMD_ADD_JOB		= 15,
+	FIO_NET_CMD_NR			= 16,
+
+	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_CRC_SZ		= sizeof(struct fio_net_cmd) -
+						2 * sizeof(uint16_t),
+
+	FIO_NET_CLIENT_TIMEOUT		= 5000,
 };
 
 struct cmd_ts_pdu {
@@ -54,6 +73,11 @@ struct cmd_ts_pdu {
 	struct group_run_stats rs;
 };
 
+struct cmd_du_pdu {
+	struct disk_util_stat dus;
+	struct disk_util_agg agg;
+};
+
 struct cmd_probe_pdu {
 	uint8_t hostname[64];
 	uint8_t bigendian;
@@ -62,6 +86,7 @@ struct cmd_probe_pdu {
 	uint8_t fio_patch;
 	uint8_t os;
 	uint8_t arch;
+	uint8_t bpp;
 };
 
 struct cmd_single_line_pdu {
@@ -74,42 +99,63 @@ struct cmd_line_pdu {
 	struct cmd_single_line_pdu options[0];
 };
 
-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, ...);
-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);
+struct cmd_start_pdu {
+	uint32_t jobs;
+};
+
+struct cmd_end_pdu {
+	uint32_t error;
+};
+
+struct cmd_add_job_pdu {
+	struct thread_options_pack top;
+};
+
+struct cmd_text_pdu {
+	uint32_t level;
+	uint32_t buf_len;
+	uint64_t log_sec;
+	uint64_t log_usec;
+	uint8_t buf[0];
+};
+
+extern int fio_start_server(char *);
+extern int fio_server_text_output(int, const char *, size_t);
+extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t);
+extern int fio_net_send_simple_cmd(int, uint16_t, uint64_t, struct flist_head *);
 extern void fio_server_set_arg(const char *);
-extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *);
+extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *, struct in6_addr *, int *);
+extern int fio_server_parse_host(const char *, int *, struct in_addr *, struct in6_addr *);
+extern const char *fio_server_op(unsigned int);
+extern void fio_server_got_signal(int);
 
 struct thread_stat;
 struct group_run_stats;
 extern void fio_server_send_ts(struct thread_stat *, struct group_run_stats *);
 extern void fio_server_send_gs(struct group_run_stats *);
-extern void fio_server_send_status(void);
+extern void fio_server_send_du(void);
 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 int fio_client_add(const char *, void **);
-extern void 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);
 extern void fio_net_cmd_crc(struct fio_net_cmd *);
 extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
+struct thread_options;
+extern void fio_server_send_add_job(struct thread_options *, const char *);
+
 extern int exit_backend;
 extern int fio_net_port;
 
 static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
-				    const void *pdu, uint32_t pdu_len)
+				    const void *pdu, uint32_t pdu_len,
+				    uint64_t tag)
 {
 	memset(cmd, 0, sizeof(*cmd));
 
 	cmd->version	= __cpu_to_le16(FIO_SERVER_VER);
 	cmd->opcode	= cpu_to_le16(opcode);
+	cmd->tag	= cpu_to_le64(tag);
 
 	if (pdu) {
 		cmd->pdu_len	= cpu_to_le32(pdu_len);