X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=server.h;h=b0cea150233e98e8f0838c24510b74e35db459a5;hb=824d6ff466fed05679a7d0991fdf3ee1d625a3c8;hp=cc4c5b435a2f022164638cf99274f8f60ff75cd9;hpb=ae5888523480f094ce04375a45797e111273ab22;p=fio.git diff --git a/server.h b/server.h index cc4c5b43..b0cea150 100644 --- a/server.h +++ b/server.h @@ -38,7 +38,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 35, + FIO_SERVER_VER = 44, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, @@ -61,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, @@ -76,6 +79,31 @@ enum { 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 { struct thread_stat ts; struct group_run_stats rs; @@ -88,6 +116,7 @@ struct cmd_du_pdu { struct cmd_client_probe_pdu { uint64_t flags; + uint8_t server[128]; }; struct cmd_probe_reply_pdu { @@ -168,11 +197,7 @@ 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 void fio_client_add_cmd_option(void *, const char *); -extern void fio_client_add_ini_file(void *, const char *); +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);