server: transmit status as structures, not text

[fio.git] / server.h

diff --git a/server.h b/server.h
index d66782d532a6124c8364afec6e66ad29da584f44..10c9006e4339c1ec57a6f12eed5da26493ddc680 100644 (file)
--- a/server.h
+++ b/server.h
@@ -5,6 +5,8 @@
 #include <string.h>
 #include <endian.h>
 
+#include "stat.h"
+
 /*
  * On-wire encoding is little endian
  */
@@ -13,10 +15,13 @@ struct fio_net_cmd {
        uint16_t opcode;        /* command opcode */
        uint32_t flags;         /* modifier flags */
        uint64_t serial;        /* serial number */
-       uint32_t pad;
        uint32_t pdu_len;       /* length of post-cmd layload */
-       uint32_t cmd_crc32;     /* cmd checksum */
-       uint32_t pdu_crc32;     /* payload checksum */
+       /*
+        * These must be immediately before the payload, anything before
+        * these fields are checksummed.
+        */
+       uint16_t cmd_crc16;     /* cmd checksum */
+       uint16_t pdu_crc16;     /* payload checksum */
        uint8_t payload[0];     /* payload */
 };
 
@@ -24,28 +29,48 @@ enum {
        FIO_SERVER_VER          = 1,
        FIO_SERVER_VER1         = 1,
 
-       FIO_SERVER_MAX_PDU      = 4096,
+       FIO_SERVER_MAX_PDU      = 64,
 
        FIO_NET_CMD_QUIT        = 1,
-       FIO_NET_CMD_JOB         = 2,
-       FIO_NET_CMD_JOB_END     = 3,
+       FIO_NET_CMD_EXIT        = 2,
+       FIO_NET_CMD_JOB         = 3,
        FIO_NET_CMD_ACK         = 4,
        FIO_NET_CMD_NAK         = 5,
        FIO_NET_CMD_TEXT        = 6,
+       FIO_NET_CMD_TS          = 7,
+       FIO_NET_CMD_GS          = 8,
+
+       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),
 };
 
-extern int fio_server(void);
+struct cmd_ts_pdu {
+       struct thread_stat ts;
+       struct group_run_stats rs;
+};
+
+extern int fio_start_server(int);
 extern int fio_server_text_output(const char *, unsigned int len);
 extern int fio_server_log(const char *format, ...);
+extern int fio_net_send_cmd(int, uint16_t, const void *, off_t);
+
+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 int fio_client_connect(const char *);
-extern int fio_client_send_ini(const char *);
+extern int fio_clients_connect(void);
+extern int fio_clients_send_ini(const char *);
 extern int fio_handle_clients(void);
+extern void fio_client_add(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_cmd_read(int sk);
+extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
 extern int exit_backend;
 extern int fio_net_port;