X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=5273fd17cff55b45b7a20ccf45b042a3070f936a;hb=dbc542d442b81ddc58939be96a1c89e9953b9698;hp=dbe7cd4135e5bb4fe60743fbf6c6009789f4176c;hpb=f58bd2a4fc0ba558fd90878fe7db5f2d4809990b;p=fio.git

diff --git a/server.h b/server.h
index dbe7cd41..5273fd17 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			= 14,
+	FIO_SERVER_VER			= 18,
 
 	FIO_SERVER_MAX_FRAGMENT_PDU	= 1024,
 
@@ -86,12 +86,12 @@ struct cmd_du_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 fio_version[32];
 	uint8_t os;
 	uint8_t arch;
 	uint8_t bpp;
+	uint32_t cpus;
+	uint64_t flags;
 };
 
 struct cmd_single_line_pdu {
@@ -144,7 +144,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 *);
@@ -157,6 +157,12 @@ 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_clients_connect(void);
+extern int fio_clients_send_ini(const char *);
+extern void fio_client_add_cmd_option(void *, const char *);
+extern void fio_client_add_ini_file(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);