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

diff --git a/server.h b/server.h
index 5c7c8db9..7a801bf0 100644
--- a/server.h
+++ b/server.h
@@ -38,34 +38,35 @@ 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			= 10,
+
+	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_NR			= 17,
+
+	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_CLIENT_TIMEOUT		= 5000,
 };
 
 struct cmd_ts_pdu {
@@ -108,19 +109,19 @@ 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];
 };
 
 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 *);