X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=b0c5e2dfafa0f8359b7e68d4be63db2ff48a614f;hp=b45b319ba2013e56ecc87056e8e0b6ca1aaec6e2;hb=HEAD;hpb=e7e536b665bd6a9d3e936e0847dbbb6957101da4 diff --git a/server.h b/server.h index b45b319b..83ce449b 100644 --- a/server.h +++ b/server.h @@ -15,6 +15,9 @@ struct sk_out { unsigned int refs; /* frees sk_out when it drops to zero. * protected by below ->lock */ +#ifdef WIN32 + HANDLE hProcess; /* process handle of handle_connection_process*/ +#endif int sk; /* socket fd to talk to client */ struct fio_sem lock; /* protects ref and below list */ struct flist_head list; /* list of pending transmit work */ @@ -48,7 +51,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 89, + FIO_SERVER_VER = 104, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, @@ -193,7 +196,9 @@ struct cmd_iolog_pdu { uint32_t log_type; uint32_t compressed; uint32_t log_offset; + uint32_t log_prio; uint32_t log_hist_coarseness; + uint32_t per_job_logs; uint8_t name[FIO_NET_NAME_MAX]; struct io_sample samples[0]; }; @@ -211,6 +216,7 @@ 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 *, 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 void fio_server_internal_set(const char *); extern int fio_server_parse_string(const char *, char **, bool *, int *, struct in_addr *, struct in6_addr *, int *); extern int fio_server_parse_host(const char *, int, struct in_addr *, struct in6_addr *); extern const char *fio_server_op(unsigned int); @@ -221,6 +227,7 @@ extern void fio_server_send_gs(struct group_run_stats *); extern void fio_server_send_du(void); extern void fio_server_send_job_options(struct flist_head *, unsigned int); extern int fio_server_get_verify_state(const char *, int, void **); +extern bool fio_server_poll_fd(int fd, short events, int timeout); extern struct fio_net_cmd *fio_net_recv_cmd(int sk, bool wait);