client: partial revert of 9899aff3e345

[fio.git] / client.h

diff --git a/client.h b/client.h
index 10d6ec36cac34f1de66e5cc0951cd191c9375e33..d632f468f714114102e88657da73a1f45123a516 100644 (file)
--- a/client.h
+++ b/client.h
@@ -20,6 +20,11 @@ enum {
        Client_exited           = 5,
 };
 
+struct client_file {
+       char *file;
+       int remote;
+};
+
 struct fio_client {
        struct flist_head list;
        struct flist_head hash_list;
@@ -64,8 +69,8 @@ struct fio_client {
        struct client_ops *ops;
        void *client_data;
 
-       char **ini_file;
-       unsigned int nr_ini_file;
+       struct client_file *files;
+       unsigned int nr_files;
 };
 
 struct cmd_iolog_pdu;
@@ -101,8 +106,8 @@ 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 *);
@@ -119,13 +124,13 @@ 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 *, 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_add_ini_file(void *, const char *);
+extern int fio_client_add_ini_file(void *, const char *, int);
 extern int fio_client_terminate(struct fio_client *);
 extern void fio_clients_terminate(void);
 extern struct fio_client *fio_get_client(struct fio_client *);