Various cleanups

[fio.git] / client.h

diff --git a/client.h b/client.h
index ab093171271590e322627aa7c3c4248eab6059ad..fc9c19693a9ff0c60bfcee6429755344b72cdfdf 100644 (file)
--- a/client.h
+++ b/client.h
@@ -20,6 +20,11 @@ enum {
        Client_exited           = 5,
 };
 
+struct client_file {
+       char *file;
+       bool remote;
+};
+
 struct fio_client {
        struct flist_head list;
        struct flist_head hash_list;
@@ -36,18 +41,28 @@ struct fio_client {
 
        char *name;
 
+       struct flist_head *opt_lists;
+
        int state;
 
        int skip_newline;
        int is_sock;
        int disk_stats_shown;
        unsigned int jobs;
+       unsigned int nr_stat;
        int error;
+       int signal;
        int ipv6;
        int sent_job;
+       int did_stat;
+       uint32_t type;
+
+       uint32_t thread_number;
+       uint32_t groupid;
 
        struct flist_head eta_list;
        struct client_eta *eta_in_flight;
+       unsigned int eta_timeouts;
 
        struct flist_head cmd_list;
 
@@ -56,45 +71,46 @@ struct fio_client {
 
        struct client_ops *ops;
        void *client_data;
+
+       struct client_file *files;
+       unsigned int nr_files;
 };
 
-typedef void (*client_text_op_func)(struct fio_client *client, struct fio_net_cmd *cmd);
-typedef void (*client_disk_util_op_func)(struct fio_client *client, struct fio_net_cmd *cmd);
-typedef void (*client_thread_status_op)(struct fio_client *client, struct fio_net_cmd *cmd);
-typedef void (*client_group_stats_op)(struct fio_client *client, struct fio_net_cmd *cmd);
-typedef void (*client_eta_op)(struct jobs_eta *je);
-typedef void (*client_jobs_eta_op)(struct fio_client *client, struct jobs_eta *je);
-typedef void (*client_probe_op)(struct fio_client *client, struct fio_net_cmd *cmd);
-typedef void (*client_thread_status_display_op)(char *status_message, double perc);
-typedef void (*client_quit_op)(struct fio_client *);
-typedef void (*client_add_job_op)(struct fio_client *, struct fio_net_cmd *);
-typedef void (*client_timed_out)(struct fio_client *);
-typedef void (*client_stop_op)(struct fio_client *, struct fio_net_cmd *);
+typedef void (client_cmd_op)(struct fio_client *, struct fio_net_cmd *);
+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);
 
 struct client_ops {
-       client_text_op_func text_op;
-       client_disk_util_op_func disk_util;
-       client_thread_status_op thread_status;
-       client_group_stats_op group_stats;
-       client_jobs_eta_op jobs_eta;
-       client_eta_op eta;
-       client_probe_op probe;
-       client_quit_op quit;
-       client_add_job_op add_job;
-       client_timed_out timed_out;
-       client_stop_op stop;
+       client_cmd_op           *text;
+       client_cmd_op           *disk_util;
+       client_cmd_op           *thread_status;
+       client_cmd_op           *group_stats;
+       client_jobs_eta_op      *jobs_eta;
+       client_eta_op           *eta;
+       client_cmd_op           *probe;
+       client_cmd_op           *quit;
+       client_cmd_op           *add_job;
+       client_cmd_op           *update_job;
+       client_timed_out_op     *timed_out;
+       client_cmd_op           *stop;
+       client_cmd_op           *start;
+       client_cmd_op           *job_start;
+       client_timed_out_op     *removed;
+
+       unsigned int eta_msec;
        int stay_connected;
+       uint32_t client_type;
 };
 
 extern struct client_ops fio_client_ops;
 
 struct client_eta {
-       struct jobs_eta eta;
        unsigned int pending;
+       struct jobs_eta eta;
 };
 
 extern int fio_handle_client(struct fio_client *);
-extern void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op fn);
 extern void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je);
 
 enum {
@@ -108,12 +124,29 @@ extern int fio_clients_connect(void);
 extern int fio_start_client(struct fio_client *);
 extern int fio_start_all_clients(void);
 extern int fio_clients_send_ini(const char *);
+extern int fio_client_send_ini(struct fio_client *, const char *, bool);
 extern int fio_handle_clients(struct client_ops *);
 extern int fio_client_add(struct client_ops *, const char *, void **);
 extern struct fio_client *fio_client_add_explicit(struct client_ops *, const char *, int, int);
 extern void fio_client_add_cmd_option(void *, const char *);
-extern void fio_client_terminate(struct fio_client *);
-extern void fio_clients_terminate(void);
+extern int fio_client_add_ini_file(void *, const char *, bool);
+extern int fio_client_terminate(struct fio_client *);
+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 *);
+extern int fio_client_wait_for_reply(struct fio_client *, uint64_t);
+extern int fio_clients_send_trigger(const char *);
+
+#define FIO_CLIENT_DEF_ETA_MSEC                900
+
+enum {
+       FIO_CLIENT_TYPE_CLI             = 1,
+       FIO_CLIENT_TYPE_GUI             = 2,
+};
+
+extern int sum_stat_clients;
+extern struct thread_stat client_ts;
+extern struct group_run_stats client_gs;
 
 #endif