X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=116b3d605d8da1aac6c9b39ee0469cad9db51817;hp=a366f68862a5c018d8b36da8fdca35ecb7aeaceb;hb=731e30a2551315c609c23ac107377b63c02d51fa;hpb=8b4e61b27203fff2cc68a967ae3f6cacaca71e43

diff --git a/server.c b/server.c
index a366f688..116b3d60 100644
--- a/server.c
+++ b/server.c
@@ -16,6 +16,7 @@
 #include <netdb.h>
 #include <syslog.h>
 #include <signal.h>
+#include <zlib.h>
 
 #include "fio.h"
 #include "server.h"
@@ -233,9 +234,11 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
 
 				buf[pdu->buf_len ] = '\0';
 			} else if (cmdret->opcode == FIO_NET_CMD_JOB) {
-				char *buf = (char *) cmdret->payload;
+				struct cmd_job_pdu *pdu = (struct cmd_job_pdu *) cmdret->payload;
+				char *buf = (char *) pdu->buf;
+				int len = le32_to_cpu(pdu->buf_len);
 
-				buf[cmdret->pdu_len ] = '\0';
+				buf[len] = '\0';
 			}
 		}
 
@@ -246,15 +249,19 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
 	return cmdret;
 }
 
-void fio_net_cmd_crc(struct fio_net_cmd *cmd)
+void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, void *pdu)
 {
 	uint32_t pdu_len;
 
 	cmd->cmd_crc16 = __cpu_to_le16(fio_crc16(cmd, FIO_NET_CMD_CRC_SZ));
 
 	pdu_len = le32_to_cpu(cmd->pdu_len);
-	if (pdu_len)
-		cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(cmd->payload, pdu_len));
+	cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(pdu, pdu_len));
+}
+
+void fio_net_cmd_crc(struct fio_net_cmd *cmd)
+{
+	fio_net_cmd_crc_pdu(cmd, cmd->payload);
 }
 
 int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
@@ -361,10 +368,14 @@ static int handle_run_cmd(struct fio_net_cmd *cmd)
 
 static int handle_job_cmd(struct fio_net_cmd *cmd)
 {
-	char *buf = (char *) cmd->payload;
+	struct cmd_job_pdu *pdu = (struct cmd_job_pdu *) cmd->payload;
+	void *buf = pdu->buf;
 	struct cmd_start_pdu spdu;
 
-	if (parse_jobs_ini(buf, 1, 0)) {
+	pdu->buf_len = le32_to_cpu(pdu->buf_len);
+	pdu->client_type = le32_to_cpu(pdu->client_type);
+
+	if (parse_jobs_ini(buf, 1, 0, pdu->client_type)) {
 		fio_server_send_quit_cmd();
 		return -1;
 	}
@@ -386,6 +397,7 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd)
 
 	clp = pdu;
 	clp->lines = le16_to_cpu(clp->lines);
+	clp->client_type = le16_to_cpu(clp->client_type);
 	argv = malloc(clp->lines * sizeof(char *));
 	offset = sizeof(*clp);
 
@@ -399,7 +411,7 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd)
 		dprint(FD_NET, "server: %d: %s\n", i, argv[i]);
 	}
 
-	if (parse_cmd_line(clp->lines, argv)) {
+	if (parse_cmd_line(clp->lines, argv, clp->client_type)) {
 		fio_server_send_quit_cmd();
 		free(argv);
 		return -1;
@@ -839,10 +851,85 @@ void fio_server_send_du(void)
 	}
 }
 
+int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)
+{
+	struct cmd_iolog_pdu pdu;
+	struct fio_net_cmd cmd;
+	z_stream stream;
+	void *out_pdu;
+	int i;
+
+	pdu.nr_samples = __cpu_to_le32(log->nr_samples);
+	pdu.log_type = cpu_to_le32(log->log_type);
+	strcpy((char *) pdu.name, name);
+
+	for (i = 0; i < log->nr_samples; i++) {
+		struct io_sample *s = &log->log[i];
+
+		s->time	= cpu_to_le64(s->time);
+		s->val	= cpu_to_le64(s->val);
+		s->ddir	= cpu_to_le32(s->ddir);
+		s->bs	= cpu_to_le32(s->bs);
+	}
+
+	/*
+	 * Dirty - since the log is potentially huge, compress it into
+	 * FIO_SERVER_MAX_FRAGMENT_PDU chunks and let the receiving
+	 * side defragment it.
+	 */
+	out_pdu = malloc(FIO_SERVER_MAX_FRAGMENT_PDU);
+
+	stream.zalloc = Z_NULL;
+	stream.zfree = Z_NULL;
+	stream.opaque = Z_NULL;
+
+	if (deflateInit(&stream, Z_DEFAULT_COMPRESSION) != Z_OK) {
+		free(out_pdu);
+		return 1;
+	}
+
+	/*
+	 * Send header first, it's not compressed.
+	 */
+	__fio_init_net_cmd(&cmd, FIO_NET_CMD_IOLOG, sizeof(pdu), 0);
+	cmd.flags = __cpu_to_le32(FIO_NET_CMD_F_MORE);
+	fio_net_cmd_crc_pdu(&cmd, &pdu);
+	fio_send_data(server_fd, &cmd, sizeof(cmd));
+	fio_send_data(server_fd, &pdu, sizeof(pdu));
+
+	stream.next_in = (void *) log->log;
+	stream.avail_in = log->nr_samples * sizeof(struct io_sample);
+
+	do {
+		unsigned int this_len;
+
+		stream.avail_out = FIO_SERVER_MAX_FRAGMENT_PDU;
+		stream.next_out = out_pdu;
+		assert(deflate(&stream, Z_FINISH) == Z_OK);
+
+		this_len = FIO_SERVER_MAX_FRAGMENT_PDU - stream.avail_out;
+
+		__fio_init_net_cmd(&cmd, FIO_NET_CMD_IOLOG, this_len, 0);
+
+		if (stream.avail_in)
+			cmd.flags = __cpu_to_le32(FIO_NET_CMD_F_MORE);
+
+		fio_net_cmd_crc_pdu(&cmd, out_pdu);
+
+		fio_send_data(server_fd, &cmd, sizeof(cmd));
+		fio_send_data(server_fd, out_pdu, this_len);
+	} while (stream.avail_in);
+
+	free(out_pdu);
+	deflateEnd(&stream);
+	return 0;
+}
+
 void fio_server_send_add_job(struct thread_options *o, const char *ioengine)
 {
 	struct cmd_add_job_pdu pdu;
 
+	memset(&pdu, 0, sizeof(pdu));
 	convert_thread_options_to_net(&pdu.top, o);
 
 	fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), 0);
@@ -1234,8 +1321,8 @@ int fio_start_server(char *pidfile)
 	int ret;
 
 #if defined(WIN32)
-    WSADATA wsd;
-    WSAStartup(MAKEWORD(2,2), &wsd);
+	WSADATA wsd;
+	WSAStartup(MAKEWORD(2,2), &wsd);
 #endif
 
 	if (!pidfile)