X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=33f69ef611a7ae2dd7eda4bd7e0e15c3284487a6;hp=e7107d448072afd4d1a2678a74a76c2ad1721c56;hb=7078106dbbc524b6a3b2c39ddd04a9f676b10e53;hpb=76867621c76ce561c315cd9c8d6b055eddd75d88

diff --git a/server.c b/server.c
index e7107d44..33f69ef6 100644
--- a/server.c
+++ b/server.c
@@ -124,7 +124,7 @@ static int verify_convert_cmd(struct fio_net_cmd *cmd)
 	cmd->cmd_crc16 = le16_to_cpu(cmd->cmd_crc16);
 	cmd->pdu_crc16 = le16_to_cpu(cmd->pdu_crc16);
 
-	crc = crc16(cmd, FIO_NET_CMD_CRC_SZ);
+	crc = fio_crc16(cmd, FIO_NET_CMD_CRC_SZ);
 	if (crc != cmd->cmd_crc16) {
 		log_err("fio: server bad crc on command (got %x, wanted %x)\n",
 				cmd->cmd_crc16, crc);
@@ -202,7 +202,7 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
 			break;
 
 		/* Verify payload crc */
-		crc = crc16(pdu, cmd.pdu_len);
+		crc = fio_crc16(pdu, cmd.pdu_len);
 		if (crc != cmd.pdu_crc16) {
 			log_err("fio: server bad crc on payload ");
 			log_err("(got %x, wanted %x)\n", cmd.pdu_crc16, crc);
@@ -238,11 +238,11 @@ void fio_net_cmd_crc(struct fio_net_cmd *cmd)
 {
 	uint32_t pdu_len;
 
-	cmd->cmd_crc16 = __cpu_to_le16(crc16(cmd, FIO_NET_CMD_CRC_SZ));
+	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(crc16(cmd->payload, pdu_len));
+		cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(cmd->payload, pdu_len));
 }
 
 int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
@@ -346,7 +346,7 @@ static int handle_job_cmd(struct fio_net_cmd *cmd)
 	spdu.jobs = cpu_to_le32(thread_number);
 	fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0);
 
-	ret = exec_run();
+	ret = fio_backend();
 
 	epdu.error = ret;
 	fio_net_send_cmd(server_fd, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), 0);
@@ -390,7 +390,7 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd)
 
 	fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0, NULL);
 
-	ret = exec_run();
+	ret = fio_backend();
 	fio_server_send_quit_cmd();
 	reset_fio_state();
 	return ret;
@@ -453,7 +453,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
 		je->iops[i]	= cpu_to_le32(je->iops[i]);
 	}
 
-	je->elapsed_sec		= cpu_to_le32(je->nr_running);
+	je->elapsed_sec		= cpu_to_le64(je->elapsed_sec);
 	je->eta_sec		= cpu_to_le64(je->eta_sec);
 
 	fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
@@ -1187,6 +1187,11 @@ int fio_start_server(char *pidfile)
 	pid_t pid;
 	int ret;
 
+#if defined(WIN32)
+	WSADATA wsd;
+	WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
 	if (!pidfile)
 		return fio_server();