X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.h;h=394b685df70f608a9a7bb3535c2a4a92239684f5;hp=5b9c277049dbb844eb35b9f89ee36cfa8f74a5c6;hb=5a83478fc279abe98ce17182e1569246e99bbcec;hpb=46bcd498f7b3fb55f7f048bf299f36bd8c8f7db1

diff --git a/client.h b/client.h
index 5b9c2770..394b685d 100644
--- a/client.h
+++ b/client.h
@@ -6,6 +6,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "lib/types.h"
 #include "stat.h"
 
 struct fio_net_cmd;
@@ -20,6 +21,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,19 +42,28 @@ struct fio_client {
 
 	char *name;
 
+	struct flist_head *opt_lists;
+
 	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;
+	bool sent_job;
+	bool 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;
 
@@ -57,6 +72,9 @@ struct fio_client {
 
 	struct client_ops *ops;
 	void *client_data;
+
+	struct client_file *files;
+	unsigned int nr_files;
 };
 
 typedef void (client_cmd_op)(struct fio_client *, struct fio_net_cmd *);
@@ -74,10 +92,12 @@ struct client_ops {
 	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;
@@ -87,12 +107,11 @@ struct client_ops {
 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 {
@@ -105,16 +124,19 @@ 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_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
 
@@ -123,5 +145,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