Move client structure into client.h

GUI will need it.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/client.c b/client.c
index 3c6778565882b969df59874081e0da2217ff17b7..faa990ba8abe79aba8f76db9fafa405013d855af 100644 (file)
--- a/client.c
+++ b/client.c
@@ -28,40 +28,6 @@ struct client_eta {
        unsigned int pending;
 };
 
-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;
-
-       char *name;
-
-       int state;
-
-       int skip_newline;
-       int is_sock;
-       int disk_stats_shown;
-       unsigned int jobs;
-       int error;
-       int ipv6;
-       int sent_job;
-
-       struct flist_head eta_list;
-       struct client_eta *eta_in_flight;
-
-       struct flist_head cmd_list;
-
-       uint16_t argc;
-       char **argv;
-};
-
 static void fio_client_text_op(struct fio_client *client,
                FILE *f, __u16 pdu_len, const char *buf)
 {

diff --git a/client.h b/client.h
index f5ec9a3e5dff7134fa8a598c21ce8e82c86f6ff2..acf31ff043f3fd8bac98957b52aee79d54523440 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1,9 +1,47 @@
 #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>
+
 struct fio_net_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;
+
+       char *name;
+
+       int state;
+
+       int skip_newline;
+       int is_sock;
+       int disk_stats_shown;
+       unsigned int jobs;
+       int error;
+       int ipv6;
+       int sent_job;
+
+       struct flist_head eta_list;
+       struct client_eta *eta_in_flight;
+
+       struct flist_head cmd_list;
+
+       uint16_t argc;
+       char **argv;
+};
+
 typedef void (*client_text_op_func)(struct fio_client *client,
                FILE *f, __u16 pdu_len, const char *buf);