client/server: pass back packed thread_options in add_job()

[fio.git] / server.h

diff --git a/server.h b/server.h
index 72e4cc888dc8ff9649da36cfe0bb9752d7ec6d86..f8ba81a838feaab32e16ed20bfcba5982fcb61ee 100644 (file)
--- a/server.h
+++ b/server.h
@@ -3,9 +3,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
@@ -25,8 +30,15 @@ struct fio_net_cmd {
        uint8_t payload[0];     /* payload */
 };
 
+struct fio_net_int_cmd {
+       struct fio_net_cmd cmd;
+       struct flist_head list;
+       struct timeval tv;
+       uint64_t saved_tag;
+};
+
 enum {
-       FIO_SERVER_VER          = 5,
+       FIO_SERVER_VER          = 9,
 
        FIO_SERVER_MAX_PDU      = 1024,
 
@@ -42,12 +54,18 @@ enum {
        FIO_NET_CMD_PROBE       = 10,
        FIO_NET_CMD_START       = 11,
        FIO_NET_CMD_STOP        = 12,
+       FIO_NET_CMD_DU          = 13,
+       FIO_NET_CMD_RUN         = 14,
+       FIO_NET_CMD_ADD_JOB     = 15,
+       FIO_NET_CMD_NR          = 16,
 
        FIO_NET_CMD_F_MORE      = 1UL << 0,
 
        /* crc does not include the crc fields */
        FIO_NET_CMD_CRC_SZ      = sizeof(struct fio_net_cmd) -
                                        2 * sizeof(uint16_t),
+
+       FIO_NET_CLIENT_TIMEOUT  = 5000,
 };
 
 struct cmd_ts_pdu {
@@ -55,6 +73,11 @@ struct cmd_ts_pdu {
        struct group_run_stats rs;
 };
 
+struct cmd_du_pdu {
+       struct disk_util_stat dus;
+       struct disk_util_agg agg;
+};
+
 struct cmd_probe_pdu {
        uint8_t hostname[64];
        uint8_t bigendian;
@@ -63,6 +86,7 @@ struct cmd_probe_pdu {
        uint8_t fio_patch;
        uint8_t os;
        uint8_t arch;
+       uint8_t bpp;
 };
 
 struct cmd_single_line_pdu {
@@ -75,31 +99,51 @@ 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;
+};
+
+struct cmd_add_job_pdu {
+       struct thread_options_pack top;
+};
+
+struct cmd_text_pdu {
+       uint32_t level;
+       uint32_t buf_len;
+       uint64_t log_sec;
+       uint64_t log_usec;
+       uint8_t buf[0];
+};
+
 extern int fio_start_server(char *);
-extern int fio_server_text_output(const char *, unsigned int len);
-extern int fio_server_log(const char *format, ...);
+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);
-extern int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag);
+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 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);
 
 struct thread_stat;
 struct group_run_stats;
 extern void fio_server_send_ts(struct thread_stat *, struct group_run_stats *);
 extern void fio_server_send_gs(struct group_run_stats *);
+extern void fio_server_send_du(void);
 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_client_add(const char *, void **);
-extern void fio_client_add_cmd_option(void *, const char *);
-
 extern int fio_recv_data(int sk, void *p, unsigned int len);
 extern int fio_send_data(int sk, const void *p, unsigned int len);
 extern void fio_net_cmd_crc(struct fio_net_cmd *);
 extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
+struct thread_options;
+extern void fio_server_send_add_job(struct thread_options *, const char *);
+
 extern int exit_backend;
 extern int fio_net_port;