Split mutex.c and .h each into three files

[fio.git] / server.h

diff --git a/server.h b/server.h
index 3a1d0b0205a5e96c6d9cb594d19daeec1bcf3ca1..bd892fcc1ad6b02c70a35569435f1d5b5484cba4 100644 (file)
--- a/server.h
+++ b/server.h
@@ -12,6 +12,17 @@
 
 #define FIO_NET_PORT 8765
 
+struct sk_out {
+       unsigned int refs;      /* frees sk_out when it drops to zero.
+                                * protected by below ->lock */
+
+       int sk;                 /* socket fd to talk to client */
+       struct fio_mutex 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 */
+};
+
 /*
  * On-wire encoding is little endian
  */
@@ -32,13 +43,13 @@ struct fio_net_cmd {
 
 struct fio_net_cmd_reply {
        struct flist_head list;
-       struct timeval tv;
+       struct timespec ts;
        uint64_t saved_tag;
        uint16_t opcode;
 };
 
 enum {
-       FIO_SERVER_VER                  = 60,
+       FIO_SERVER_VER                  = 71,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
        FIO_SERVER_MAX_CMD_MB           = 2048,
@@ -201,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);