X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=3c704213a82fe35c88780e13f32f8ca6bc59890c;hp=dbe7cd4135e5bb4fe60743fbf6c6009789f4176c;hb=d31e26d0a575f91db96bda4d76b36fe38996d5f8;hpb=f58bd2a4fc0ba558fd90878fe7db5f2d4809990b diff --git a/server.h b/server.h index dbe7cd41..3c704213 100644 --- a/server.h +++ b/server.h @@ -30,15 +30,15 @@ struct fio_net_cmd { uint8_t payload[0]; /* payload */ }; -struct fio_net_int_cmd { - struct fio_net_cmd cmd; +struct fio_net_cmd_reply { struct flist_head list; struct timeval tv; uint64_t saved_tag; + uint16_t opcode; }; enum { - FIO_SERVER_VER = 14, + FIO_SERVER_VER = 15, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, @@ -92,6 +92,8 @@ struct cmd_probe_pdu { uint8_t os; uint8_t arch; uint8_t bpp; + uint32_t cpus; + uint64_t flags; }; struct cmd_single_line_pdu { @@ -144,7 +146,7 @@ struct cmd_iolog_pdu { extern int fio_start_server(char *); extern int fio_server_text_output(int, const char *, size_t); -extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t); +extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t *, struct flist_head *); 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 *, struct in6_addr *, int *);