Convert net commands in the generic command handler

[fio.git] / client.h

diff --git a/client.h b/client.h
index 0071484121c38136d457f367dc907cedd49fb171..532a33a44c7f7ceab83edf8cafc8e30d47f53fbf 100644 (file)
--- a/client.h
+++ b/client.h
@@ -46,22 +46,16 @@ struct fio_client {
        void *client_data;
 };
 
-typedef void (*client_text_op_func)(struct fio_client *client,
-               FILE *f, __u16 pdu_len, const char *buf);
-
+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_net_cmd *cmd);
-
 typedef void (*client_group_stats_op)(struct fio_net_cmd *cmd);
-
 typedef void (*client_eta_op)(struct fio_client *client, struct fio_net_cmd *cmd);
-
 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 *);
 
 struct client_ops {
        client_text_op_func text_op;
@@ -71,6 +65,8 @@ struct client_ops {
        client_eta_op eta;
        client_probe_op probe;
        client_quit_op quit;
+       client_add_job_op add_job;
+       client_timed_out timed_out;
        int stay_connected;
 };
 
@@ -84,7 +80,6 @@ struct client_eta {
 extern int fio_handle_client(struct fio_client *, struct client_ops *ops);
 extern void fio_client_dec_jobs_eta(struct client_eta *eta, void (*fn)(struct jobs_eta *));
 extern void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je);
-extern void fio_client_convert_jobs_eta(struct jobs_eta *je);
 
 enum {
        Fio_client_ipv4 = 1,
@@ -98,6 +93,7 @@ extern int fio_handle_clients(struct client_ops *ops);
 extern int fio_client_add(const char *, void **);
 extern struct fio_client *fio_client_add_explicit(const char *, int, int);
 extern void fio_client_add_cmd_option(void *, const char *);
+extern void fio_clients_terminate(void);
 
 #endif