X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=46745aa2bbd158c966d0d257e4fb41fc8b085cdc;hp=a838126fff0f97e1847907308e914f5d9b3dc80b;hb=cab2440c23426b06e7e8327c5353fbd8373dcb5a;hpb=80666bece308842c36132245e4cbbe9eb0bc506b diff --git a/server.h b/server.h index a838126f..46745aa2 100644 --- 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,7 +38,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 17, + FIO_SERVER_VER = 23, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, @@ -71,6 +71,8 @@ enum { FIO_NET_NAME_MAX = 256, FIO_NET_CLIENT_TIMEOUT = 5000, + + FIO_PROBE_FLAG_ZLIB = 1UL << 0, }; struct cmd_ts_pdu { @@ -83,7 +85,11 @@ struct cmd_du_pdu { struct disk_util_agg agg; }; -struct cmd_probe_pdu { +struct cmd_client_probe_pdu { + uint64_t flags; +}; + +struct cmd_probe_reply_pdu { uint8_t hostname[64]; uint8_t bigendian; uint8_t fio_version[32]; @@ -96,13 +102,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 +119,7 @@ struct cmd_job_pdu { struct cmd_start_pdu { uint32_t jobs; + uint32_t stat_outputs; }; struct cmd_end_pdu { @@ -138,6 +145,7 @@ struct cmd_iolog_pdu { uint32_t thread_number; uint32_t nr_samples; uint32_t log_type; + uint32_t compressed; uint8_t name[FIO_NET_NAME_MAX]; struct io_sample samples[0]; }; @@ -157,6 +165,12 @@ 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); +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_recv_data(int sk, void *p, unsigned int len); extern int fio_send_data(int sk, const void *p, unsigned int len);