client/server: track and handle command timeouts

[fio.git] / server.h

diff --git a/server.h b/server.h
index c6e9ce215b9c2e6ecb077ac61aa0d170cc05ff8e..cd07a85d627881fd7c379439f98103e20e676e30 100644 (file)
--- a/server.h
+++ b/server.h
@@ -3,6 +3,7 @@
 
 #include <inttypes.h>
 #include <string.h>
+#include <sys/time.h>
 
 #include "stat.h"
 #include "os/os.h"
@@ -14,7 +15,7 @@ struct fio_net_cmd {
        uint16_t version;       /* protocol version */
        uint16_t opcode;        /* command opcode */
        uint32_t flags;         /* modifier flags */
-       uint64_t serial;        /* serial number */
+       uint64_t tag;           /* passed back on reply */
        uint32_t pdu_len;       /* length of post-cmd layload */
        /*
         * These must be immediately before the payload, anything before
@@ -25,9 +26,15 @@ struct fio_net_cmd {
        uint8_t payload[0];     /* payload */
 };
 
+struct fio_net_int_cmd {
+       struct fio_net_cmd cmd;
+       struct flist_head list;
+       struct timeval tv;
+       uint64_t saved_tag;
+};
+
 enum {
-       FIO_SERVER_VER          = 3,
-       FIO_SERVER_VER3         = 3,
+       FIO_SERVER_VER          = 5,
 
        FIO_SERVER_MAX_PDU      = 1024,
 
@@ -38,10 +45,12 @@ enum {
        FIO_NET_CMD_TEXT        = 5,
        FIO_NET_CMD_TS          = 6,
        FIO_NET_CMD_GS          = 7,
-       FIO_NET_CMD_ETA         = 8,
-       FIO_NET_CMD_PROBE       = 9,
-       FIO_NET_CMD_START       = 10,
-       FIO_NET_CMD_STOP        = 11,
+       FIO_NET_CMD_SEND_ETA    = 8,
+       FIO_NET_CMD_ETA         = 9,
+       FIO_NET_CMD_PROBE       = 10,
+       FIO_NET_CMD_START       = 11,
+       FIO_NET_CMD_STOP        = 12,
+       FIO_NET_CMD_NR          = 13,
 
        FIO_NET_CMD_F_MORE      = 1UL << 0,
 
@@ -49,7 +58,7 @@ enum {
        FIO_NET_CMD_CRC_SZ      = sizeof(struct fio_net_cmd) -
                                        2 * sizeof(uint16_t),
 
-       FIO_NET_CMD_JOBLINE_ARGV        = 128,
+       FIO_NET_CLIENT_TIMEOUT  = 5000,
 };
 
 struct cmd_ts_pdu {
@@ -67,31 +76,36 @@ struct cmd_probe_pdu {
        uint8_t arch;
 };
 
+struct cmd_single_line_pdu {
+       uint16_t len;
+       uint8_t text[0];
+};
+
 struct cmd_line_pdu {
-       uint16_t argc;
-       uint8_t argv[FIO_NET_CMD_JOBLINE_ARGV][64];
+       uint16_t lines;
+       struct cmd_single_line_pdu options[0];
 };
 
-extern int fio_start_server(int);
-extern int fio_server_text_output(const char *, unsigned int len);
+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);
-extern int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial);
+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 const char *fio_server_op(unsigned int);
 
 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_status(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 int fio_client_add_cmd_option(void *, const char *);
+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);
@@ -102,12 +116,14 @@ extern int exit_backend;
 extern int fio_net_port;
 
 static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
-                                   const void *pdu, uint32_t pdu_len)
+                                   const void *pdu, uint32_t pdu_len,
+                                   uint64_t tag)
 {
        memset(cmd, 0, sizeof(*cmd));
 
-       cmd->version    = __cpu_to_le16(FIO_SERVER_VER3);
+       cmd->version    = __cpu_to_le16(FIO_SERVER_VER);
        cmd->opcode     = cpu_to_le16(opcode);
+       cmd->tag        = cpu_to_le64(tag);
 
        if (pdu) {
                cmd->pdu_len    = cpu_to_le32(pdu_len);