X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=e84a709565552a8a12fe4c57152c3813ac80408b;hp=3c704213a82fe35c88780e13f32f8ca6bc59890c;hb=95820b6e6c92025df8d89c0bf39b174e53137c41;hpb=61b29c20eb4b1d374636d5325fb56c0fa9a574ad diff --git a/server.h b/server.h index 3c704213..e84a7095 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 = 15, + FIO_SERVER_VER = 20, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, @@ -86,9 +86,7 @@ struct cmd_du_pdu { struct cmd_probe_pdu { uint8_t hostname[64]; uint8_t bigendian; - uint8_t fio_major; - uint8_t fio_minor; - uint8_t fio_patch; + uint8_t fio_version[32]; uint8_t os; uint8_t arch; uint8_t bpp; @@ -98,13 +96,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 { @@ -115,6 +113,7 @@ struct cmd_job_pdu { struct cmd_start_pdu { uint32_t jobs; + uint32_t stat_outputs; }; struct cmd_end_pdu { @@ -159,6 +158,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);