From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 29 Feb 2012 10:44:34 +0000 (+0100)
Subject: Move client structure into client.h
X-Git-Tag: gfio-0.1~290
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=0f92bd205af256af6d4a12cc8883f68b4d23ca85;hp=0420ba6a85617cb02e196ac92e519191dafc6c52

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 3c677856..faa990ba 100644
--- 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 f5ec9a3e..acf31ff0 100644
--- 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);