X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.h;h=ddacf785d0dfcd0e76aa979bd87f979ff80379b3;hp=d632f468f714114102e88657da73a1f45123a516;hb=bc0fe8b846bacd02bb5bf43d659086d293792bc3;hpb=323255cc22693c927067a1bd5219c09b3ee4dd10 diff --git a/client.h b/client.h index d632f468..ddacf785 100644 --- a/client.h +++ b/client.h @@ -22,7 +22,7 @@ enum { struct client_file { char *file; - int remote; + bool remote; }; struct fio_client { @@ -41,6 +41,8 @@ struct fio_client { char *name; + struct flist_head *opt_lists; + int state; int skip_newline; @@ -60,6 +62,7 @@ struct fio_client { struct flist_head eta_list; struct client_eta *eta_in_flight; + unsigned int eta_timeouts; struct flist_head cmd_list; @@ -73,12 +76,10 @@ struct fio_client { unsigned int nr_files; }; -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_cmd_op *text; @@ -95,7 +96,6 @@ struct client_ops { 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; @@ -111,7 +111,6 @@ struct client_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 { @@ -125,18 +124,19 @@ extern int fio_clients_connect(void); extern int fio_start_client(struct fio_client *); extern int fio_start_all_clients(void); extern int fio_clients_send_ini(const char *); -extern int fio_client_send_ini(struct fio_client *, const char *, int); +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 int fio_client_add_ini_file(void *, const char *, int); +extern int fio_client_add_ini_file(void *, const char *, bool); 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 *); 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