X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.c;h=0f64c23586aef13f3b830ab4effd650553a12e9f;hb=802ad4a83e92a30b5fdccf117d59fbb69068c054;hp=dee164daa1ae99bc6ac1cf769f0e64a002f81a04;hpb=9abea48bee7340fdf0aee00fa734a3071d47ed86;p=fio.git

diff --git a/server.c b/server.c
index dee164da..0f64c235 100644
--- a/server.c
+++ b/server.c
@@ -8,15 +8,17 @@
 #include <sys/poll.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/mman.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <syslog.h>
+#include <signal.h>
 
 #include "fio.h"
 #include "server.h"
 #include "crc/crc16.h"
+#include "ieee754.h"
 
 int fio_net_port = 8765;
 
@@ -299,8 +301,12 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd)
 
 	pdu->argc = le16_to_cpu(pdu->argc);
 
-	for (i = 0; i < pdu->argc; i++)
+	dprint(FD_NET, "server: %d command line args\n", pdu->argc);
+
+	for (i = 0; i < pdu->argc; i++) {
 		argv[i] = (char *) pdu->argv[i];
+		dprint(FD_NET, "server: %d: %s\n", i, argv[i]);
+	}
 
 	if (parse_cmd_line(pdu->argc, argv))
 		return -1;
@@ -319,6 +325,9 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd)
 
 	memset(&probe, 0, sizeof(probe));
 	gethostname((char *) probe.hostname, sizeof(probe.hostname));
+#ifdef FIO_BIG_ENDIAN
+	probe.bigendian = 1;
+#endif
 	probe.fio_major = FIO_MAJOR;
 	probe.fio_minor = FIO_MINOR;
 	probe.fio_patch = FIO_PATCH;
@@ -391,11 +400,13 @@ void fio_server_idle_loop(void)
 
 static int accept_loop(int listen_sk)
 {
-	struct sockaddr addr;
-	unsigned int len = sizeof(addr);
+	struct sockaddr_in addr;
+	fio_socklen_t len = sizeof(addr);
 	struct pollfd pfd;
 	int ret, sk, flags, exitval = 0;
 
+	dprint(FD_NET, "server enter accept loop\n");
+
 	flags = fcntl(listen_sk, F_GETFL);
 	flags |= O_NONBLOCK;
 	fcntl(listen_sk, F_SETFL, flags);
@@ -419,13 +430,13 @@ again:
 	if (exit_backend)
 		goto out;
 
-	sk = accept(listen_sk, &addr, &len);
+	sk = accept(listen_sk, (struct sockaddr *) &addr, &len);
 	if (sk < 0) {
 		log_err("fio: accept: %s\n", strerror(errno));
 		return -1;
 	}
 
-	dprint(FD_NET, "server got a connection\n");
+	dprint(FD_NET, "server: connect from %s\n", inet_ntoa(addr.sin_addr));
 
 	server_fd = sk;
 
@@ -446,7 +457,7 @@ int fio_server_text_output(const char *buf, unsigned int len)
 	if (server_fd != -1)
 		return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len);
 
-	return 0;
+	return fwrite(buf, len, 1, f_err);
 }
 
 static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
@@ -454,9 +465,12 @@ static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
 	dst->max_val	= cpu_to_le64(src->max_val);
 	dst->min_val	= cpu_to_le64(src->min_val);
 	dst->samples	= cpu_to_le64(src->samples);
-	/* FIXME */
-	dst->mean	= __cpu_to_le64(src->mean);
-	dst->S		= __cpu_to_le64(src->S);
+
+	/*
+	 * Encode to IEEE 754 for network transfer
+	 */
+	dst->mean.u.i	= __cpu_to_le64(fio_double_to_uint64(src->mean.u.f));
+	dst->S.u.i	= __cpu_to_le64(fio_double_to_uint64(src->S.u.f));
 }
 
 static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
@@ -485,6 +499,8 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
 	struct cmd_ts_pdu p;
 	int i, j;
 
+	dprint(FD_NET, "server sending end stats\n");
+
 	memset(&p, 0, sizeof(p));
 
 	strcpy(p.ts.name, ts->name);
@@ -509,7 +525,12 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
 	p.ts.minf		= cpu_to_le64(ts->minf);
 	p.ts.majf		= cpu_to_le64(ts->majf);
 	p.ts.clat_percentiles	= cpu_to_le64(ts->clat_percentiles);
-	p.ts.percentile_list	= NULL;
+
+	for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
+		fio_fp64_t *fp = &p.ts.percentile_list[i];
+
+		fp->u.i = __cpu_to_le64(fio_double_to_uint64(fp->u.f));
+	}
 
 	for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
 		p.ts.io_u_map[i]	= cpu_to_le32(ts->io_u_map[i]);
@@ -554,6 +575,8 @@ void fio_server_send_gs(struct group_run_stats *rs)
 {
 	struct group_run_stats gs;
 
+	dprint(FD_NET, "server sending group run stats\n");
+
 	convert_gs(&gs, rs);
 	fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs));
 }
@@ -575,6 +598,8 @@ void fio_server_send_status(void)
 		return;
 	}
 
+	dprint(FD_NET, "server sending status\n");
+
 	je->nr_running		= cpu_to_le32(je->nr_running);
 	je->nr_ramp		= cpu_to_le32(je->nr_ramp);
 	je->nr_pending		= cpu_to_le32(je->nr_pending);
@@ -602,6 +627,8 @@ int fio_server_log(const char *format, ...)
 	va_list args;
 	size_t len;
 
+	dprint(FD_NET, "server log\n");
+
 	va_start(args, format);
 	len = vsnprintf(buffer, sizeof(buffer), format, args);
 	va_end(args);
@@ -613,7 +640,7 @@ static int fio_server(void)
 {
 	struct sockaddr_in saddr_in;
 	struct sockaddr addr;
-	unsigned int len;
+	fio_socklen_t len;
 	int sk, opt, ret;
 
 	dprint(FD_NET, "starting server\n");
@@ -630,7 +657,7 @@ static int fio_server(void)
 		return -1;
 	}
 #ifdef SO_REUSEPORT
-	if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
+	if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
 		log_err("fio: setsockopt: %s\n", strerror(errno));
 		return -1;
 	}
@@ -682,7 +709,6 @@ static void server_signal_handler(void)
 	sigaction(SIGTERM, &act, NULL);
 }
 
-
 int fio_start_server(int daemonize)
 {
 	pid_t pid;