X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=client.h;h=a89afd8de8a664b5ad85cf14f8cb43317c3483da;hb=75450781fef7fd1d48742dc3a791f0f1119c675c;hp=ea7ea6f17bf03579dfe1b35272b458d91aa3f7dd;hpb=e476994eed3bee246ca166ea6ad6018911408e9b;p=fio.git

diff --git a/client.h b/client.h
index ea7ea6f1..a89afd8d 100644
--- a/client.h
+++ b/client.h
@@ -43,8 +43,10 @@ struct fio_client {
 	int disk_stats_shown;
 	unsigned int jobs;
 	int error;
+	int signal;
 	int ipv6;
 	int sent_job;
+	uint32_t type;
 
 	struct flist_head eta_list;
 	struct client_eta *eta_in_flight;
@@ -58,37 +60,33 @@ struct fio_client {
 	void *client_data;
 };
 
-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_start_op)(struct fio_client *, struct fio_net_cmd *);
-typedef void (*client_job_start_op)(struct fio_client *, struct fio_net_cmd *);
+struct cmd_iolog_pdu;
+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);
+typedef void (client_iolog_op)(struct fio_client *client, struct cmd_iolog_pdu *);
 
 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_start_op start;
-	client_job_start_op job_start;
+	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_timed_out_op	*timed_out;
+	client_cmd_op		*stop;
+	client_cmd_op		*start;
+	client_cmd_op		*job_start;
+	client_iolog_op		*iolog;
+	client_timed_out_op	*removed;
+
 	unsigned int eta_msec;
 	int stay_connected;
+	uint32_t client_type;
 };
 
 extern struct client_ops fio_client_ops;
@@ -118,12 +116,17 @@ 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 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 *);
 
 #define FIO_CLIENT_DEF_ETA_MSEC		900
 
+enum {
+	FIO_CLIENT_TYPE_CLI		= 1,
+	FIO_CLIENT_TYPE_GUI		= 2,
+};
+
 #endif