Merge branch 'dev' of https://github.com/smartxworks/fio

[fio.git] / client.h

diff --git a/client.h b/client.h
index ddacf785d0dfcd0e76aa979bd87f979ff80379b3..8033325ed0a94371643cb5ebf8c1f69b029e8889 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1,15 +1,14 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "lib/types.h"
 #include "stat.h"
 
 struct fio_net_cmd;
-struct client_ops;
 
 enum {
        Client_created          = 0,
@@ -38,6 +37,7 @@ struct fio_client {
        int port;
        int fd;
        unsigned int refs;
+       unsigned int last_cmd;
 
        char *name;
 
@@ -45,16 +45,16 @@ struct fio_client {
 
        int state;
 
-       int skip_newline;
-       int is_sock;
-       int disk_stats_shown;
+       bool skip_newline;
+       bool is_sock;
+       bool disk_stats_shown;
        unsigned int jobs;
        unsigned int nr_stat;
        int error;
        int signal;
        int ipv6;
-       int sent_job;
-       int did_stat;
+       bool sent_job;
+       bool did_stat;
        uint32_t type;
 
        uint32_t thread_number;
@@ -74,13 +74,18 @@ struct fio_client {
 
        struct client_file *files;
        unsigned int nr_files;
+
+       struct buf_output buf;
 };
 
 typedef void (client_cmd_op)(struct fio_client *, struct fio_net_cmd *);
+typedef void (client_op)(struct fio_client *);
 typedef void (client_eta_op)(struct jobs_eta *je);
 typedef void (client_timed_out_op)(struct fio_client *);
 typedef void (client_jobs_eta_op)(struct fio_client *client, struct jobs_eta *je);
 
+extern struct client_ops fio_client_ops;
+
 struct client_ops {
        client_cmd_op           *text;
        client_cmd_op           *disk_util;
@@ -93,7 +98,7 @@ struct client_ops {
        client_cmd_op           *add_job;
        client_cmd_op           *update_job;
        client_timed_out_op     *timed_out;
-       client_cmd_op           *stop;
+       client_op               *stop;
        client_cmd_op           *start;
        client_cmd_op           *job_start;
        client_timed_out_op     *removed;
@@ -103,8 +108,6 @@ struct client_ops {
        uint32_t client_type;
 };
 
-extern struct client_ops fio_client_ops;
-
 struct client_eta {
        unsigned int pending;
        struct jobs_eta eta;
@@ -131,7 +134,6 @@ extern struct fio_client *fio_client_add_explicit(struct client_ops *, const cha
 extern void fio_client_add_cmd_option(void *, const char *);
 extern int fio_client_add_ini_file(void *, const char *, bool);
 extern int fio_client_terminate(struct fio_client *);
-extern void fio_clients_terminate(void);
 extern struct fio_client *fio_get_client(struct fio_client *);
 extern void fio_put_client(struct fio_client *);
 extern int fio_client_update_options(struct fio_client *, struct thread_options *, uint64_t *);
@@ -145,5 +147,9 @@ enum {
        FIO_CLIENT_TYPE_GUI             = 2,
 };
 
+extern int sum_stat_clients;
+extern struct thread_stat client_ts;
+extern struct group_run_stats client_gs;
+
 #endif