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

diff --git a/server.h b/server.h
index 49f02a6c..5c7c8db9 100644
--- a/server.h
+++ b/server.h
@@ -4,9 +4,13 @@
 #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
@@ -34,7 +38,7 @@ struct fio_net_int_cmd {
 };
 
 enum {
-	FIO_SERVER_VER		= 5,
+	FIO_SERVER_VER		= 8,
 
 	FIO_SERVER_MAX_PDU	= 1024,
 
@@ -50,7 +54,10 @@ enum {
 	FIO_NET_CMD_PROBE	= 10,
 	FIO_NET_CMD_START	= 11,
 	FIO_NET_CMD_STOP	= 12,
-	FIO_NET_CMD_NR		= 13,
+	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,
 
@@ -66,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;
@@ -74,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 {
@@ -86,13 +99,33 @@ struct cmd_line_pdu {
 	struct cmd_single_line_pdu options[0];
 };
 
+struct cmd_start_pdu {
+	uint32_t jobs;
+};
+
+struct cmd_end_pdu {
+	uint32_t error;
+};
+
+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;
+};
+
 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_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);
 
@@ -100,19 +133,17 @@ 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_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;