X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=83cb57ea033ecd039a1c1331b27178d1a77bd9cc;hb=37adbfc4e189873d1d02c145b81c779971ef5337;hp=a483913062cfb527f64c718356366cd6d2266c33;hpb=108fea772db5f1dd91e2fb67737e3e0d36827b76;p=fio.git

diff --git a/client.c b/client.c
index a4839130..83cb57ea 100644
--- a/client.c
+++ b/client.c
@@ -21,8 +21,8 @@
 #include "hash.h"
 
 struct client_eta {
-	struct jobs_eta eta;
 	unsigned int pending;
+	struct jobs_eta eta;
 };
 
 struct fio_client {
@@ -267,7 +267,7 @@ int fio_client_add(const char *hostname, void **cookie)
 static int fio_client_connect_ip(struct fio_client *client)
 {
 	struct sockaddr *addr;
-	fio_socklen_t socklen;
+	socklen_t socklen;
 	int fd, domain;
 
 	if (client->ipv6) {
@@ -304,7 +304,7 @@ static int fio_client_connect_ip(struct fio_client *client)
 static int fio_client_connect_sock(struct fio_client *client)
 {
 	struct sockaddr_un *addr = &client->addr_un;
-	fio_socklen_t len;
+	socklen_t len;
 	int fd;
 
 	memset(addr, 0, sizeof(*addr));
@@ -1037,7 +1037,7 @@ static int fio_client_timed_out(void)
 	struct timeval tv;
 	int ret = 0;
 
-	gettimeofday(&tv, NULL);
+	fio_gettime(&tv, NULL);
 
 	flist_for_each_safe(entry, tmp, &client_list) {
 		client = flist_entry(entry, struct fio_client, list);
@@ -1061,7 +1061,7 @@ int fio_handle_clients(void)
 	struct pollfd *pfds;
 	int i, ret = 0, retval = 0;
 
-	gettimeofday(&eta_tv, NULL);
+	fio_gettime(&eta_tv, NULL);
 
 	pfds = malloc(nr_clients * sizeof(struct pollfd));
 
@@ -1095,7 +1095,7 @@ int fio_handle_clients(void)
 		do {
 			struct timeval tv;
 
-			gettimeofday(&tv, NULL);
+			fio_gettime(&tv, NULL);
 			if (mtime_since(&eta_tv, &tv) >= 900) {
 				request_client_etas();
 				memcpy(&eta_tv, &tv, sizeof(tv));