server: bump protocol version

[fio.git] / server.h

diff --git a/server.h b/server.h
index b0cea150233e98e8f0838c24510b74e35db459a5..4a81bcdc5be2e65e78dde4a895893b45ac3ac9b6 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 44,
+       FIO_SERVER_VER                  = 59,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
        FIO_SERVER_MAX_CMD_MB           = 2048,
@@ -64,7 +64,8 @@ enum {
        FIO_NET_CMD_LOAD_FILE           = 19,
        FIO_NET_CMD_VTRIGGER            = 20,
        FIO_NET_CMD_SENDFILE            = 21,
-       FIO_NET_CMD_NR                  = 22,
+       FIO_NET_CMD_JOB_OPT             = 22,
+       FIO_NET_CMD_NR                  = 23,
 
        FIO_NET_CMD_F_MORE              = 1UL << 0,
 
@@ -171,16 +172,30 @@ struct cmd_text_pdu {
        uint8_t buf[0];
 };
 
+enum {
+       XMIT_COMPRESSED         = 1U,
+       STORE_COMPRESSED        = 2U,
+};
+
 struct cmd_iolog_pdu {
        uint64_t nr_samples;
        uint32_t thread_number;
        uint32_t log_type;
        uint32_t compressed;
        uint32_t log_offset;
+       uint32_t log_hist_coarseness;
        uint8_t name[FIO_NET_NAME_MAX];
        struct io_sample samples[0];
 };
 
+struct cmd_job_option {
+       uint16_t global;
+       uint16_t truncated;
+       uint32_t groupid;
+       uint8_t name[64];
+       uint8_t value[128];
+};
+
 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 *, struct flist_head *);
@@ -196,44 +211,20 @@ 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 void fio_server_send_job_options(struct flist_head *, unsigned int);
 extern int fio_server_get_verify_state(const char *, int, void **);
 
-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 void fio_net_cmd_crc_pdu(struct fio_net_cmd *, const void *);
-extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
+extern struct fio_net_cmd *fio_net_recv_cmd(int sk, bool wait);
 
 extern int fio_send_iolog(struct thread_data *, struct io_log *, const char *);
 extern void fio_server_send_add_job(struct thread_data *);
 extern void fio_server_send_start(struct thread_data *);
-extern int fio_net_send_stop(int sk, int error, int signal);
 extern int fio_net_send_quit(int sk);
 
+extern int fio_server_create_sk_key(void);
+extern void fio_server_destroy_sk_key(void);
+
 extern int exit_backend;
 extern int fio_net_port;
 
-static inline void __fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
-                                     uint32_t pdu_len, uint64_t tag)
-{
-       memset(cmd, 0, sizeof(*cmd));
-
-       cmd->version    = __cpu_to_le16(FIO_SERVER_VER);
-       cmd->opcode     = cpu_to_le16(opcode);
-       cmd->tag        = cpu_to_le64(tag);
-       cmd->pdu_len    = cpu_to_le32(pdu_len);
-}
-
-
-static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
-                                   const void *pdu, uint32_t pdu_len,
-                                   uint64_t tag)
-{
-       __fio_init_net_cmd(cmd, opcode, pdu_len, tag);
-
-       if (pdu)
-               memcpy(&cmd->payload, pdu, pdu_len);
-}
-
 #endif