Add new net command for text logging

[fio.git] / server.h

diff --git a/server.h b/server.h
index 99689d403d9c8c83e103776f01e0f80a5dd822b2..299c7a03738b002e318ef4d7df2e8886cfe23fac 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          = 6,
+       FIO_SERVER_VER          = 9,
 
        FIO_SERVER_MAX_PDU      = 1024,
 
@@ -53,7 +56,8 @@ enum {
        FIO_NET_CMD_STOP        = 12,
        FIO_NET_CMD_DU          = 13,
        FIO_NET_CMD_RUN         = 14,
-       FIO_NET_CMD_NR          = 15,
+       FIO_NET_CMD_ADD_JOB     = 15,
+       FIO_NET_CMD_NR          = 16,
 
        FIO_NET_CMD_F_MORE      = 1UL << 0,
 
@@ -103,13 +107,32 @@ struct cmd_end_pdu {
        uint32_t error;
 };
 
+struct cmd_add_job_pdu {
+       uint8_t jobname[32];
+       uint8_t ioengine[32];
+       uint32_t iodepth;
+       uint32_t rw;
+       uint32_t min_bs[2];
+       uint32_t max_bs[2];
+       uint32_t numjobs;
+       uint32_t group_reporting;
+};
+
+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 *, size_t);
-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, 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);
 
@@ -120,17 +143,14 @@ 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;