X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=281330202884187356b90e5ea5e02ab09301c203;hb=6d7f8d9a31f9ecdeab0eed8f23c63b9a94ec61f6;hp=40b9eac2de9852a27449b79b3946d952ee64127d;hpb=55bfd8c81c25d7953b4d6f9320e46af5cb790b0c;p=fio.git diff --git a/server.h b/server.h index 40b9eac2..28133020 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 = 77, + FIO_SERVER_VER = 98, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, @@ -193,6 +196,7 @@ struct cmd_iolog_pdu { uint32_t log_type; uint32_t compressed; uint32_t log_offset; + uint32_t log_prio; uint32_t log_hist_coarseness; uint8_t name[FIO_NET_NAME_MAX]; struct io_sample samples[0]; @@ -211,6 +215,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 +226,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); @@ -232,7 +238,7 @@ extern int fio_net_send_quit(int sk); extern int fio_server_create_sk_key(void); extern void fio_server_destroy_sk_key(void); -extern int exit_backend; +extern bool exit_backend; extern int fio_net_port; #endif