X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.h;h=caeb432a1bc4fb9bf4f95311e1f505afdcea2921;hb=3863d1ad1020200f26958da42ed208f6c5c8f372;hp=ea297897957a4a9073a6fd24ebf50947785a74a7;hpb=807f9971e7bfedfc905d2cb2c38a6e558db2f343;p=fio.git

diff --git a/client.h b/client.h
index ea297897..caeb432a 100644
--- a/client.h
+++ b/client.h
@@ -9,6 +9,16 @@
 #include "stat.h"
 
 struct fio_net_cmd;
+struct client_ops;
+
+enum {
+	Client_created		= 0,
+	Client_connected	= 1,
+	Client_started		= 2,
+	Client_running		= 3,
+	Client_stopped		= 4,
+	Client_exited		= 5,
+};
 
 struct fio_client {
 	struct flist_head list;
@@ -22,6 +32,7 @@ struct fio_client {
 	char *hostname;
 	int port;
 	int fd;
+	unsigned int refs;
 
 	char *name;
 
@@ -43,29 +54,35 @@ struct fio_client {
 	uint16_t argc;
 	char **argv;
 
+	struct client_ops *ops;
 	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_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 *);
 
 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;
 	int stay_connected;
 };
 
@@ -76,10 +93,9 @@ struct client_eta {
 	unsigned int pending;
 };
 
-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 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);
-extern void fio_client_convert_jobs_eta(struct jobs_eta *je);
 
 enum {
 	Fio_client_ipv4 = 1,
@@ -87,11 +103,20 @@ enum {
 	Fio_client_socket,
 };
 
+extern int fio_client_connect(struct fio_client *);
 extern int fio_clients_connect(void);
+extern int fio_start_client(struct fio_client *);
+extern int fio_start_all_clients(void);
+extern int fio_client_send_ini(struct fio_client *, const char *);
 extern int fio_clients_send_ini(const char *);
-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 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 struct fio_client *fio_get_client(struct fio_client *);
+extern void fio_put_client(struct fio_client *);
+
 #endif