X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=server.h;h=6a6ac338f3acffc5237f1842b8c71b8774704ae2;hb=4e5b8fb8e2d989789e18b31f9aed969c8fa43cdb;hp=82a6db660ce7a4a72fa4cfeabd555f07dfae5e30;hpb=e951bdc47d094d43d6f41de95c6af191b8346459;p=fio.git diff --git a/server.h b/server.h index 82a6db66..6a6ac338 100644 --- a/server.h +++ b/server.h @@ -26,8 +26,9 @@ struct fio_net_cmd { }; enum { - FIO_SERVER_VER = 1, + FIO_SERVER_VER = 2, FIO_SERVER_VER1 = 1, + FIO_SERVER_VER2 = 2, FIO_SERVER_MAX_PDU = 64, @@ -75,6 +76,8 @@ extern int fio_server_text_output(const char *, unsigned int len); extern int fio_server_log(const char *format, ...); extern int fio_net_send_cmd(int, uint16_t, const void *, off_t); extern int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial); +extern void fio_server_set_arg(const char *); +extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *); struct thread_stat; struct group_run_stats; @@ -86,8 +89,8 @@ extern void fio_server_idle_loop(void); extern int fio_clients_connect(void); extern int fio_clients_send_ini(const char *); extern int fio_handle_clients(void); -extern void fio_client_add(const char *); -extern int fio_client_add_cmd_option(const char *, const char *); +extern int fio_client_add(const char *, void **); +extern int fio_client_add_cmd_option(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); @@ -102,7 +105,7 @@ static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode, { memset(cmd, 0, sizeof(*cmd)); - cmd->version = __cpu_to_le16(FIO_SERVER_VER1); + cmd->version = __cpu_to_le16(FIO_SERVER_VER2); cmd->opcode = cpu_to_le16(opcode); if (pdu) {