X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.h;h=ea7ea6f17bf03579dfe1b35272b458d91aa3f7dd;hp=f5ec9a3e5dff7134fa8a598c21ce8e82c86f6ff2;hb=9ede9c9c00f5457564677833cc44d436b7c936c4;hpb=0420ba6a85617cb02e196ac92e519191dafc6c52

diff --git a/client.h b/client.h
index f5ec9a3e..ea7ea6f1 100644
--- a/client.h
+++ b/client.h
@@ -1,35 +1,129 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-struct fio_client;
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "stat.h"
+
 struct fio_net_cmd;
+struct client_ops;
 
-typedef void (*client_text_op_func)(struct fio_client *client,
-		FILE *f, __u16 pdu_len, const char *buf);
+enum {
+	Client_created		= 0,
+	Client_connected	= 1,
+	Client_started		= 2,
+	Client_running		= 3,
+	Client_stopped		= 4,
+	Client_exited		= 5,
+};
 
-typedef void (*client_disk_util_op_func)(struct fio_client *client, struct fio_net_cmd *cmd);
+struct fio_client {
+	struct flist_head list;
+	struct flist_head hash_list;
+	struct flist_head arg_list;
+	union {
+		struct sockaddr_in addr;
+		struct sockaddr_in6 addr6;
+		struct sockaddr_un addr_un;
+	};
+	char *hostname;
+	int port;
+	int fd;
+	unsigned int refs;
 
-typedef void (*client_thread_status_op)(struct fio_net_cmd *cmd);
+	char *name;
 
-typedef void (*client_group_stats_op)(struct fio_net_cmd *cmd);
+	int state;
 
-typedef void (*client_eta_op)(struct fio_client *client, struct fio_net_cmd *cmd);
+	int skip_newline;
+	int is_sock;
+	int disk_stats_shown;
+	unsigned int jobs;
+	int error;
+	int ipv6;
+	int sent_job;
 
-typedef void (*client_probe_op)(struct fio_client *client, struct fio_net_cmd *cmd);
+	struct flist_head eta_list;
+	struct client_eta *eta_in_flight;
+
+	struct flist_head cmd_list;
+
+	uint16_t argc;
+	char **argv;
+
+	struct client_ops *ops;
+	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 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_thread_status_display_op thread_status_display;
+	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;
+	unsigned int eta_msec;
+	int stay_connected;
 };
 
 extern struct client_ops fio_client_ops;
 
+struct client_eta {
+	struct jobs_eta eta;
+	unsigned int pending;
+};
+
+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 {
+	Fio_client_ipv4 = 1,
+	Fio_client_ipv6,
+	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 *);
+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 *);
+
+#define FIO_CLIENT_DEF_ETA_MSEC		900
+
 #endif