X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=d652d31cf8992b5233b21fad77765a2e13426ece;hp=468fd32c217069c0baf02f909685916e79ec35c9;hb=0f0346e0c8f9141ceea8a5de8264c635ea0cae9b;hpb=52830b23d88149617d553a98fe6cb81e2fe1d743 diff --git a/server.h b/server.h index 468fd32c..d652d31c 100644 --- a/server.h +++ b/server.h @@ -17,10 +17,10 @@ struct sk_out { * protected by below ->lock */ int sk; /* socket fd to talk to client */ - struct fio_mutex lock; /* protects ref and below list */ + struct fio_sem lock; /* protects ref and below list */ struct flist_head list; /* list of pending transmit work */ - struct fio_mutex wait; /* wake backend when items added to list */ - struct fio_mutex xmit; /* held while sending data */ + struct fio_sem wait; /* wake backend when items added to list */ + struct fio_sem xmit; /* held while sending data */ }; /* @@ -49,7 +49,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 64, + FIO_SERVER_VER = 71, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, @@ -212,7 +212,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 int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *, struct in6_addr *, int *); +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); extern void fio_server_got_signal(int);