Bump the client ETA timeout from 5s to 30s

[fio.git] / server.h

diff --git a/server.h b/server.h
index a838126fff0f97e1847907308e914f5d9b3dc80b..eb29de7817e28f148c19427c136ee9d174ba5c48 100644 (file)
--- a/server.h
+++ b/server.h
@@ -27,7 +27,7 @@ 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_cmd_reply {
@@ -38,9 +38,10 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 17,
+       FIO_SERVER_VER                  = 47,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
+       FIO_SERVER_MAX_CMD_MB           = 2048,
 
        FIO_NET_CMD_QUIT                = 1,
        FIO_NET_CMD_EXIT                = 2,
@@ -60,7 +61,10 @@ enum {
        FIO_NET_CMD_RUN                 = 16,
        FIO_NET_CMD_IOLOG               = 17,
        FIO_NET_CMD_UPDATE_JOB          = 18,
-       FIO_NET_CMD_NR                  = 19,
+       FIO_NET_CMD_LOAD_FILE           = 19,
+       FIO_NET_CMD_VTRIGGER            = 20,
+       FIO_NET_CMD_SENDFILE            = 21,
+       FIO_NET_CMD_NR                  = 22,
 
        FIO_NET_CMD_F_MORE              = 1UL << 0,
 
@@ -70,7 +74,34 @@ enum {
 
        FIO_NET_NAME_MAX                = 256,
 
-       FIO_NET_CLIENT_TIMEOUT          = 5000,
+       FIO_NET_CLIENT_TIMEOUT          = 30000,
+
+       FIO_PROBE_FLAG_ZLIB             = 1UL << 0,
+};
+
+struct cmd_sendfile {
+       uint8_t path[FIO_NET_NAME_MAX];
+};
+
+struct cmd_sendfile_reply {
+       uint32_t size;
+       uint32_t error;
+       uint8_t data[0];
+};
+
+/*
+ * Client sends this to server on VTRIGGER, server sends back a full
+ * all_io_list structure.
+ */
+struct cmd_vtrigger_pdu {
+       uint16_t len;
+       uint8_t cmd[];
+};
+
+struct cmd_load_file_pdu {
+       uint16_t name_len;
+       uint16_t client_type;
+       uint8_t file[];
 };
 
 struct cmd_ts_pdu {
@@ -83,7 +114,12 @@ struct cmd_du_pdu {
        struct disk_util_agg agg;
 };
 
-struct cmd_probe_pdu {
+struct cmd_client_probe_pdu {
+       uint64_t flags;
+       uint8_t server[128];
+};
+
+struct cmd_probe_reply_pdu {
        uint8_t hostname[64];
        uint8_t bigendian;
        uint8_t fio_version[32];
@@ -96,13 +132,13 @@ struct cmd_probe_pdu {
 
 struct cmd_single_line_pdu {
        uint16_t len;
-       uint8_t text[0];
+       uint8_t text[];
 };
 
 struct cmd_line_pdu {
        uint16_t lines;
        uint16_t client_type;
-       struct cmd_single_line_pdu options[0];
+       struct cmd_single_line_pdu options[];
 };
 
 struct cmd_job_pdu {
@@ -113,6 +149,7 @@ struct cmd_job_pdu {
 
 struct cmd_start_pdu {
        uint32_t jobs;
+       uint32_t stat_outputs;
 };
 
 struct cmd_end_pdu {
@@ -135,9 +172,11 @@ struct cmd_text_pdu {
 };
 
 struct cmd_iolog_pdu {
+       uint64_t nr_samples;
        uint32_t thread_number;
-       uint32_t nr_samples;
        uint32_t log_type;
+       uint32_t compressed;
+       uint32_t log_offset;
        uint8_t name[FIO_NET_NAME_MAX];
        struct io_sample samples[0];
 };
@@ -148,7 +187,7 @@ extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t *, stru
 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 *);
-extern int fio_server_parse_host(const char *, int *, struct in_addr *, struct in6_addr *);
+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);
 
@@ -157,6 +196,8 @@ 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_server_get_verify_state(const char *, int, void **, int *);
 
 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);