X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=99689d403d9c8c83e103776f01e0f80a5dd822b2;hb=11e950bd785d9f03b7d35a8ee4b4704256217504;hp=cd07a85d627881fd7c379439f98103e20e676e30;hpb=89c1707cb512e562b55b56c268f7fad612be6f04;p=fio.git diff --git a/server.h b/server.h index cd07a85d..99689d40 100644 --- a/server.h +++ b/server.h @@ -7,6 +7,7 @@ #include "stat.h" #include "os/os.h" +#include "diskutil.h" /* * On-wire encoding is little endian @@ -34,7 +35,7 @@ struct fio_net_int_cmd { }; enum { - FIO_SERVER_VER = 5, + FIO_SERVER_VER = 6, FIO_SERVER_MAX_PDU = 1024, @@ -50,7 +51,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,6 +69,11 @@ 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; @@ -74,6 +82,7 @@ struct cmd_probe_pdu { uint8_t fio_patch; uint8_t os; uint8_t arch; + uint8_t bpp; }; struct cmd_single_line_pdu { @@ -86,6 +95,14 @@ struct cmd_line_pdu { struct cmd_single_line_pdu options[0]; }; +struct cmd_start_pdu { + uint32_t jobs; +}; + +struct cmd_end_pdu { + uint32_t error; +}; + extern int fio_start_server(char *); extern int fio_server_text_output(const char *, size_t); extern int fio_server_log(const char *format, ...); @@ -94,11 +111,13 @@ 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); +extern void fio_server_got_signal(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_du(void); extern void fio_server_idle_loop(void); extern int fio_clients_connect(void);