fio: factor out FIO_NET_PORT

[fio.git] / server.h

diff --git a/server.h b/server.h
index d709e9826b8eec71b8f6ef45ea8577284ee9d199..2be61733534836b2d787e0ac8ec8c9ce60baf4b0 100644 (file)
--- a/server.h
+++ b/server.h
@@ -4,11 +4,14 @@
 #include <inttypes.h>
 #include <string.h>
 #include <sys/time.h>
+#include <netinet/in.h>
 
 #include "stat.h"
 #include "os/os.h"
 #include "diskutil.h"
 
+#define FIO_NET_PORT 8765
+
 /*
  * On-wire encoding is little endian
  */
@@ -35,7 +38,7 @@ struct fio_net_int_cmd {
 };
 
 enum {
-       FIO_SERVER_VER          = 5,
+       FIO_SERVER_VER          = 6,
 
        FIO_SERVER_MAX_PDU      = 1024,
 
@@ -52,7 +55,8 @@ enum {
        FIO_NET_CMD_START       = 11,
        FIO_NET_CMD_STOP        = 12,
        FIO_NET_CMD_DU          = 13,
-       FIO_NET_CMD_NR          = 14,
+       FIO_NET_CMD_RUN         = 14,
+       FIO_NET_CMD_NR          = 15,
 
        FIO_NET_CMD_F_MORE      = 1UL << 0,
 
@@ -94,13 +98,21 @@ struct cmd_line_pdu {
        struct cmd_single_line_pdu options[0];
 };
 
+struct cmd_start_pdu {
+       uint32_t jobs;
+};
+
+struct cmd_end_pdu {
+       uint32_t error;
+};
+
 extern int fio_start_server(char *);
 extern int fio_server_text_output(const char *, size_t);
 extern int fio_server_log(const char *format, ...);
 extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t);
 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 *);
+extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *, struct in6_addr *, int *);
 extern const char *fio_server_op(unsigned int);
 extern void fio_server_got_signal(int);
 
@@ -113,7 +125,7 @@ extern void fio_server_idle_loop(void);
 
 extern int fio_clients_connect(void);
 extern int fio_clients_send_ini(const char *);
-extern int fio_handle_clients(void);
+extern int fio_handle_clients(struct client_ops *ops);
 extern int fio_client_add(const char *, void **);
 extern void fio_client_add_cmd_option(void *, const char *);