X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=3c704213a82fe35c88780e13f32f8ca6bc59890c;hb=33765372d5588c347e44d868d0bd6bc416a0fd05;hp=27e552320c221d9fea252f73e161ce47934c7f8e;hpb=53bd8dbcbf692d1f622d6c9e62284121e710fdc3;p=fio.git

diff --git a/server.h b/server.h
index 27e55232..3c704213 100644
--- a/server.h
+++ b/server.h
@@ -30,15 +30,15 @@ struct fio_net_cmd {
 	uint8_t payload[0];	/* payload */
 };
 
-struct fio_net_int_cmd {
-	struct fio_net_cmd cmd;
+struct fio_net_cmd_reply {
 	struct flist_head list;
 	struct timeval tv;
 	uint64_t saved_tag;
+	uint16_t opcode;
 };
 
 enum {
-	FIO_SERVER_VER			= 12,
+	FIO_SERVER_VER			= 15,
 
 	FIO_SERVER_MAX_FRAGMENT_PDU	= 1024,
 
@@ -59,7 +59,8 @@ enum {
 	FIO_NET_CMD_ADD_JOB		= 15,
 	FIO_NET_CMD_RUN			= 16,
 	FIO_NET_CMD_IOLOG		= 17,
-	FIO_NET_CMD_NR			= 18,
+	FIO_NET_CMD_UPDATE_JOB		= 18,
+	FIO_NET_CMD_NR			= 19,
 
 	FIO_NET_CMD_F_MORE		= 1UL << 0,
 
@@ -91,6 +92,8 @@ struct cmd_probe_pdu {
 	uint8_t os;
 	uint8_t arch;
 	uint8_t bpp;
+	uint32_t cpus;
+	uint64_t flags;
 };
 
 struct cmd_single_line_pdu {
@@ -116,9 +119,12 @@ struct cmd_start_pdu {
 
 struct cmd_end_pdu {
 	uint32_t error;
+	uint32_t signal;
 };
 
 struct cmd_add_job_pdu {
+	uint32_t thread_number;
+	uint32_t groupid;
 	struct thread_options_pack top;
 };
 
@@ -131,6 +137,7 @@ struct cmd_text_pdu {
 };
 
 struct cmd_iolog_pdu {
+	uint32_t thread_number;
 	uint32_t nr_samples;
 	uint32_t log_type;
 	uint8_t name[FIO_NET_NAME_MAX];
@@ -139,7 +146,7 @@ struct cmd_iolog_pdu {
 
 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_cmd(int, uint16_t, const void *, off_t, uint64_t *, struct flist_head *);
 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 *, struct in6_addr *, int *);
@@ -152,7 +159,6 @@ 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_du(void);
-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);
@@ -161,9 +167,10 @@ extern void fio_net_cmd_crc_pdu(struct fio_net_cmd *, const 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 void fio_server_send_add_job(struct thread_data *);
+extern void fio_server_send_start(struct thread_data *);
+extern int fio_net_send_stop(int sk, int error, int signal);
+extern int fio_net_send_quit(int sk);
 
 extern int exit_backend;
 extern int fio_net_port;