server: include number of CPUs in probe reply

[fio.git] / server.h

diff --git a/server.h b/server.h
index 3c66ecbee403c254fc1a8993372ca270f1c58181..3c704213a82fe35c88780e13f32f8ca6bc59890c 100644 (file)
--- a/server.h
+++ b/server.h
@@ -30,15 +30,15 @@ struct fio_net_cmd {
        uint8_t payload[0];     /* payload */
 };
 
-struct fio_net_int_cmd {
-       struct fio_net_cmd cmd;
+struct fio_net_cmd_reply {
        struct flist_head list;
        struct timeval tv;
        uint64_t saved_tag;
+       uint16_t opcode;
 };
 
 enum {
-       FIO_SERVER_VER                  = 13,
+       FIO_SERVER_VER                  = 15,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
 
@@ -59,7 +59,8 @@ enum {
        FIO_NET_CMD_ADD_JOB             = 15,
        FIO_NET_CMD_RUN                 = 16,
        FIO_NET_CMD_IOLOG               = 17,
-       FIO_NET_CMD_NR                  = 18,
+       FIO_NET_CMD_UPDATE_JOB          = 18,
+       FIO_NET_CMD_NR                  = 19,
 
        FIO_NET_CMD_F_MORE              = 1UL << 0,
 
@@ -91,6 +92,8 @@ struct cmd_probe_pdu {
        uint8_t os;
        uint8_t arch;
        uint8_t bpp;
+       uint32_t cpus;
+       uint64_t flags;
 };
 
 struct cmd_single_line_pdu {
@@ -116,6 +119,7 @@ struct cmd_start_pdu {
 
 struct cmd_end_pdu {
        uint32_t error;
+       uint32_t signal;
 };
 
 struct cmd_add_job_pdu {
@@ -142,7 +146,7 @@ struct cmd_iolog_pdu {
 
 extern int fio_start_server(char *);
 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_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 *);
@@ -155,7 +159,6 @@ 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_recv_data(int sk, void *p, unsigned int len);
 extern int fio_send_data(int sk, const void *p, unsigned int len);
@@ -165,6 +168,9 @@ extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
 extern int fio_send_iolog(struct thread_data *, struct io_log *, const char *);
 extern void fio_server_send_add_job(struct thread_data *);
+extern void fio_server_send_start(struct thread_data *);
+extern int fio_net_send_stop(int sk, int error, int signal);
+extern int fio_net_send_quit(int sk);
 
 extern int exit_backend;
 extern int fio_net_port;