Merge branch 'master' into gfio

[fio.git] / server.h

diff --git a/server.h b/server.h
index 3c704213a82fe35c88780e13f32f8ca6bc59890c..201e62d67c943a367ebb4005a45182ed6d52ab79 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 15,
+       FIO_SERVER_VER                  = 19,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
 
@@ -86,9 +86,7 @@ struct cmd_du_pdu {
 struct cmd_probe_pdu {
        uint8_t hostname[64];
        uint8_t bigendian;
-       uint8_t fio_major;
-       uint8_t fio_minor;
-       uint8_t fio_patch;
+       uint8_t fio_version[32];
        uint8_t os;
        uint8_t arch;
        uint8_t bpp;
@@ -115,6 +113,7 @@ struct cmd_job_pdu {
 
 struct cmd_start_pdu {
        uint32_t jobs;
+       uint32_t stat_outputs;
 };
 
 struct cmd_end_pdu {
@@ -159,6 +158,12 @@ 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 void fio_client_add_cmd_option(void *, const char *);
+extern void fio_client_add_ini_file(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);