X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=2e8682c999cc395f0af45ab67723d40459735484;hp=e7107d448072afd4d1a2678a74a76c2ad1721c56;hb=e61ca217bc489cdacebc5302583128c4d73dd4e7;hpb=76867621c76ce561c315cd9c8d6b055eddd75d88 diff --git a/server.c b/server.c index e7107d44..2e8682c9 100644 --- a/server.c +++ b/server.c @@ -24,7 +24,7 @@ #include "fio_version.h" -int fio_net_port = 8765; +int fio_net_port = FIO_NET_PORT; int exit_backend = 0; @@ -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; @@ -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();