X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=76d24583de49c6bbfcec5fc47535a1ae48701835;hb=5eb3aeaef03f0263642bb25a5d46f14306636180;hp=5c7c8db9fcbb006b0414453d69085e37e34ed150;hpb=807f9971e7bfedfc905d2cb2c38a6e558db2f343;p=fio.git

diff --git a/server.h b/server.h
index 5c7c8db9..76d24583 100644
--- a/server.h
+++ b/server.h
@@ -38,34 +38,38 @@ struct fio_net_int_cmd {
 };
 
 enum {
-	FIO_SERVER_VER		= 8,
-
-	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_RUN		= 14,
-	FIO_NET_CMD_ADD_JOB	= 15,
-	FIO_NET_CMD_NR		= 16,
-
-	FIO_NET_CMD_F_MORE	= 1UL << 0,
+	FIO_SERVER_VER			= 12,
+
+	FIO_SERVER_MAX_FRAGMENT_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_RUN			= 16,
+	FIO_NET_CMD_IOLOG		= 17,
+	FIO_NET_CMD_NR			= 18,
+
+	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,
+	FIO_NET_NAME_MAX		= 256,
+
+	FIO_NET_CLIENT_TIMEOUT		= 5000,
 };
 
 struct cmd_ts_pdu {
@@ -96,9 +100,16 @@ struct cmd_single_line_pdu {
 
 struct cmd_line_pdu {
 	uint16_t lines;
+	uint16_t client_type;
 	struct cmd_single_line_pdu options[0];
 };
 
+struct cmd_job_pdu {
+	uint32_t buf_len;
+	uint32_t client_type;
+	uint8_t buf[0];
+};
+
 struct cmd_start_pdu {
 	uint32_t jobs;
 };
@@ -108,19 +119,26 @@ struct cmd_end_pdu {
 };
 
 struct cmd_add_job_pdu {
-	uint8_t jobname[32];
-	uint8_t ioengine[32];
-	uint32_t iodepth;
-	uint32_t rw;
-	uint32_t min_bs[2];
-	uint32_t max_bs[2];
-	uint32_t numjobs;
-	uint32_t group_reporting;
+	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];
+};
+
+struct cmd_iolog_pdu {
+	uint32_t nr_samples;
+	uint32_t log_type;
+	uint8_t name[FIO_NET_NAME_MAX];
+	struct io_sample samples[0];
 };
 
 extern int fio_start_server(char *);
-extern int fio_server_text_output(const char *, size_t);
-extern int fio_server_log(const char *format, ...);
+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 *);
@@ -139,28 +157,37 @@ extern void fio_server_idle_loop(void);
 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 void fio_net_cmd_crc_pdu(struct fio_net_cmd *, void *);
 extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
+extern int fio_send_iolog(struct thread_data *, struct io_log *, const char *);
+
 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,
-				    uint64_t tag)
+static inline void __fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
+				      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);
+	cmd->pdu_len	= cpu_to_le32(pdu_len);
+}
+
+
+static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
+				    const void *pdu, uint32_t pdu_len,
+				    uint64_t tag)
+{
+	__fio_init_net_cmd(cmd, opcode, pdu_len, tag);
 
-	if (pdu) {
-		cmd->pdu_len	= cpu_to_le32(pdu_len);
+	if (pdu)
 		memcpy(&cmd->payload, pdu, pdu_len);
-	}
 }
 
 #endif