server: bump protocol version

[fio.git] / server.h

diff --git a/server.h b/server.h
index 49f02a6cd55ddd23c817cf9e382fd8d7e9e8c127..da1167167749b4041de47b8598b20e0bd4346b7d 100644 (file)
--- a/server.h
+++ b/server.h
@@ -4,9 +4,11 @@
 #include <inttypes.h>
 #include <string.h>
 #include <sys/time.h>
+#include <netinet/in.h>
 
 #include "stat.h"
 #include "os/os.h"
+#include "diskutil.h"
 
 /*
  * On-wire encoding is little endian
@@ -23,18 +25,18 @@ struct fio_net_cmd {
         */
        uint16_t cmd_crc16;     /* cmd checksum */
        uint16_t pdu_crc16;     /* payload checksum */
-       uint8_t payload[0];     /* payload */
+       uint8_t payload[];      /* payload */
 };
 
 struct fio_net_int_cmd {
-       struct fio_net_cmd cmd;
        struct flist_head list;
        struct timeval tv;
        uint64_t saved_tag;
+       struct fio_net_cmd cmd;
 };
 
 enum {
-       FIO_SERVER_VER          = 5,
+       FIO_SERVER_VER          = 11,
 
        FIO_SERVER_MAX_PDU      = 1024,
 
@@ -50,7 +52,9 @@ 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_NR          = 15,
 
        FIO_NET_CMD_F_MORE      = 1UL << 0,
 
@@ -66,24 +70,37 @@ 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;
-       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;
 };
 
 struct cmd_single_line_pdu {
        uint16_t len;
-       uint8_t text[0];
+       uint8_t text[];
 };
 
 struct cmd_line_pdu {
        uint16_t lines;
-       struct cmd_single_line_pdu options[0];
+       struct cmd_single_line_pdu options[];
+};
+
+struct cmd_start_pdu {
+       uint32_t jobs;
+       uint32_t stat_outputs;
+};
+
+struct cmd_end_pdu {
+       uint32_t error;
 };
 
 extern int fio_start_server(char *);
@@ -92,7 +109,7 @@ 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 const char *fio_server_op(unsigned int);
 extern void fio_server_got_signal(int);
 
@@ -100,6 +117,7 @@ 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);
@@ -107,6 +125,7 @@ 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 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);