X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=15b802b40558827552bef5897862469f4454aeb3;hp=27da94f23c69e00ed089af87de833b84a612f9f2;hb=7496ea3e7fb234a1c92067301c028934c325daad;hpb=811826be429fd6fc5154d9b04ced1cd22bd66758 diff --git a/server.h b/server.h index 27da94f2..15b802b4 100644 --- a/server.h +++ b/server.h @@ -25,18 +25,18 @@ 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_int_cmd { - struct fio_net_cmd cmd; struct flist_head list; struct timeval tv; uint64_t saved_tag; + struct fio_net_cmd cmd; }; enum { - FIO_SERVER_VER = 6, + FIO_SERVER_VER = 10, FIO_SERVER_MAX_PDU = 1024, @@ -78,9 +78,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; @@ -88,16 +86,17 @@ 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; - struct cmd_single_line_pdu options[0]; + struct cmd_single_line_pdu options[]; }; struct cmd_start_pdu { uint32_t jobs; + uint32_t stat_outputs; }; struct cmd_end_pdu { @@ -126,6 +125,7 @@ extern int fio_clients_send_ini(const char *); extern int fio_handle_clients(void); extern int fio_client_add(const char *, void **); 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);