X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=8e5ca50f45faf5e7480c85d1e84f45f7b014afb9;hp=899b230274b1133dd54c3aacdb0020acf70056ba;hb=95820b6e6c92025df8d89c0bf39b174e53137c41;hpb=9746fdbbd89cb202ecf2ee402b79ef215390eaea diff --git a/server.c b/server.c index 899b2302..8e5ca50f 100644 --- a/server.c +++ b/server.c @@ -23,8 +23,6 @@ #include "crc/crc16.h" #include "lib/ieee754.h" -#include "fio_version.h" - int fio_net_port = FIO_NET_PORT; int exit_backend = 0; @@ -34,9 +32,22 @@ static char *fio_server_arg; static char *bind_sock; static struct sockaddr_in saddr_in; static struct sockaddr_in6 saddr_in6; -static int first_cmd_check; static int use_ipv6; +struct fio_fork_item { + struct flist_head list; + int exitval; + int signal; + int exited; + pid_t pid; +}; + +/* Created on fork on new connection */ +static FLIST_HEAD(conn_list); + +/* Created on job fork from connection */ +static FLIST_HEAD(job_list); + static const char *fio_server_ops[FIO_NET_CMD_NR] = { "", "QUIT", @@ -263,7 +274,7 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmdret->payload; char *buf = (char *) pdu->buf; - buf[pdu->buf_len ] = '\0'; + buf[pdu->buf_len] = '\0'; } else if (cmdret->opcode == FIO_NET_CMD_JOB) { struct cmd_job_pdu *pdu = (struct cmd_job_pdu *) cmdret->payload; char *buf = (char *) pdu->buf; @@ -280,6 +291,33 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) return cmdret; } +static void add_reply(uint64_t tag, struct flist_head *list) +{ + struct fio_net_cmd_reply *reply = (struct fio_net_cmd_reply *) tag; + + flist_add_tail(&reply->list, list); +} + +static uint64_t alloc_reply(uint64_t tag, uint16_t opcode) +{ + struct fio_net_cmd_reply *reply; + + reply = calloc(1, sizeof(*reply)); + INIT_FLIST_HEAD(&reply->list); + gettimeofday(&reply->tv, NULL); + reply->saved_tag = tag; + reply->opcode = opcode; + + return (uintptr_t) reply; +} + +static void free_reply(uint64_t tag) +{ + struct fio_net_cmd_reply *reply = (struct fio_net_cmd_reply *) tag; + + free(reply); +} + void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, const void *pdu) { uint32_t pdu_len; @@ -296,12 +334,19 @@ void fio_net_cmd_crc(struct fio_net_cmd *cmd) } int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size, - uint64_t tag) + uint64_t *tagptr, struct flist_head *list) { struct fio_net_cmd *cmd = NULL; size_t this_len, cur_len = 0; + uint64_t tag; int ret; + if (list) { + assert(tagptr); + tag = *tagptr = alloc_reply(*tagptr, opcode); + } else + tag = tagptr ? *tagptr : 0; + do { this_len = size; if (this_len > FIO_SERVER_MAX_FRAGMENT_PDU) @@ -327,6 +372,13 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size, buf += this_len; } while (!ret && size); + if (list) { + if (ret) + free_reply(tag); + else + add_reply(tag, list); + } + if (cmd) free(cmd); @@ -350,51 +402,154 @@ static int fio_net_send_simple_stack_cmd(int sk, uint16_t opcode, uint64_t tag) int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag, struct flist_head *list) { - struct fio_net_int_cmd *cmd; int ret; - if (!list) - return fio_net_send_simple_stack_cmd(sk, opcode, tag); + if (list) + tag = alloc_reply(tag, opcode); - cmd = malloc(sizeof(*cmd)); - - fio_init_net_cmd(&cmd->cmd, opcode, NULL, 0, (uintptr_t) cmd); - fio_net_cmd_crc(&cmd->cmd); - - INIT_FLIST_HEAD(&cmd->list); - gettimeofday(&cmd->tv, NULL); - cmd->saved_tag = tag; - - ret = fio_send_data(sk, &cmd->cmd, sizeof(cmd->cmd)); + ret = fio_net_send_simple_stack_cmd(sk, opcode, tag); if (ret) { - free(cmd); + if (list) + free_reply(tag); + return ret; } - flist_add_tail(&cmd->list, list); + if (list) + add_reply(tag, list); + return 0; } -static int fio_server_send_quit_cmd(void) +int fio_net_send_quit(int sk) { dprint(FD_NET, "server: sending quit\n"); - return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0, NULL); + + return fio_net_send_simple_cmd(sk, FIO_NET_CMD_QUIT, 0, NULL); } -static int handle_run_cmd(struct fio_net_cmd *cmd) +static int fio_net_send_ack(int sk, struct fio_net_cmd *cmd, int error, + int signal) { struct cmd_end_pdu epdu; + uint64_t tag = 0; + + if (cmd) + tag = cmd->tag; + + epdu.error = __cpu_to_le32(error); + epdu.signal = __cpu_to_le32(signal); + return fio_net_send_cmd(sk, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), &tag, NULL); +} + +int fio_net_send_stop(int sk, int error, int signal) +{ + dprint(FD_NET, "server: sending stop (%d, %d)\n", error, signal); + return fio_net_send_ack(sk, NULL, error, signal); +} + +static void fio_server_add_fork_item(pid_t pid, struct flist_head *list) +{ + struct fio_fork_item *ffi; + + ffi = malloc(sizeof(*ffi)); + ffi->exitval = 0; + ffi->signal = 0; + ffi->exited = 0; + ffi->pid = pid; + flist_add_tail(&ffi->list, list); +} + +static void fio_server_add_conn_pid(pid_t pid) +{ + dprint(FD_NET, "server: forked off connection job (pid=%u)\n", pid); + fio_server_add_fork_item(pid, &conn_list); +} + +static void fio_server_add_job_pid(pid_t pid) +{ + dprint(FD_NET, "server: forked off job job (pid=%u)\n", pid); + fio_server_add_fork_item(pid, &job_list); +} + +static void fio_server_check_fork_item(struct fio_fork_item *ffi) +{ + int ret, status; + + ret = waitpid(ffi->pid, &status, WNOHANG); + if (ret < 0) { + if (errno == ECHILD) { + log_err("fio: connection pid %u disappeared\n", ffi->pid); + ffi->exited = 1; + } else + log_err("fio: waitpid: %s\n", strerror(errno)); + } else if (ret == ffi->pid) { + if (WIFSIGNALED(status)) { + ffi->signal = WTERMSIG(status); + ffi->exited = 1; + } + if (WIFEXITED(status)) { + if (WEXITSTATUS(status)) + ffi->exitval = WEXITSTATUS(status); + ffi->exited = 1; + } + } +} + +static void fio_server_fork_item_done(struct fio_fork_item *ffi) +{ + dprint(FD_NET, "pid %u exited, sig=%u, exitval=%d\n", ffi->pid, ffi->signal, ffi->exitval); + + /* + * Fold STOP and QUIT... + */ + fio_net_send_stop(server_fd, ffi->exitval, ffi->signal); + fio_net_send_quit(server_fd); + flist_del(&ffi->list); + free(ffi); +} + +static void fio_server_check_fork_items(struct flist_head *list) +{ + struct flist_head *entry, *tmp; + struct fio_fork_item *ffi; + + flist_for_each_safe(entry, tmp, list) { + ffi = flist_entry(entry, struct fio_fork_item, list); + + fio_server_check_fork_item(ffi); + + if (ffi->exited) + fio_server_fork_item_done(ffi); + } +} + +static void fio_server_check_jobs(void) +{ + fio_server_check_fork_items(&job_list); +} + +static void fio_server_check_conns(void) +{ + fio_server_check_fork_items(&conn_list); +} + +static int handle_run_cmd(struct fio_net_cmd *cmd) +{ + pid_t pid; int ret; - ret = fio_backend(); + set_genesis_time(); - epdu.error = ret; - fio_net_send_cmd(server_fd, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), 0); + pid = fork(); + if (pid) { + fio_server_add_job_pid(pid); + return 0; + } - fio_server_send_quit_cmd(); - reset_fio_state(); - first_cmd_check = 0; - return ret; + ret = fio_backend(); + free_threads_shm(); + _exit(ret); } static int handle_job_cmd(struct fio_net_cmd *cmd) @@ -407,12 +562,13 @@ static int handle_job_cmd(struct fio_net_cmd *cmd) pdu->client_type = le32_to_cpu(pdu->client_type); if (parse_jobs_ini(buf, 1, 0, pdu->client_type)) { - fio_server_send_quit_cmd(); + fio_net_send_quit(server_fd); return -1; } spdu.jobs = cpu_to_le32(thread_number); - fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0); + spdu.stat_outputs = cpu_to_le32(stat_number); + fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), NULL, NULL); return 0; } @@ -443,7 +599,7 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd) } if (parse_cmd_line(clp->lines, argv, clp->client_type)) { - fio_server_send_quit_cmd(); + fio_net_send_quit(server_fd); free(argv); return -1; } @@ -451,37 +607,39 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd) free(argv); spdu.jobs = cpu_to_le32(thread_number); - fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0); + spdu.stat_outputs = cpu_to_le32(stat_number); + fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), NULL, NULL); return 0; } static int handle_probe_cmd(struct fio_net_cmd *cmd) { struct cmd_probe_pdu probe; + uint64_t tag = cmd->tag; dprint(FD_NET, "server: sending probe reply\n"); memset(&probe, 0, sizeof(probe)); gethostname((char *) probe.hostname, sizeof(probe.hostname)); -#ifdef FIO_BIG_ENDIAN +#ifdef CONFIG_BIG_ENDIAN probe.bigendian = 1; #endif - probe.fio_major = FIO_MAJOR; - probe.fio_minor = FIO_MINOR; - probe.fio_patch = FIO_PATCH; + strncpy((char *) probe.fio_version, fio_version_string, sizeof(probe.fio_version)); probe.os = FIO_OS; probe.arch = FIO_ARCH; - probe.bpp = sizeof(void *); + probe.cpus = __cpu_to_le32(cpus_online()); + probe.flags = 0; - return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), cmd->tag); + return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), &tag, NULL); } static int handle_send_eta_cmd(struct fio_net_cmd *cmd) { struct jobs_eta *je; size_t size; + uint64_t tag = cmd->tag; int i; if (!thread_number) @@ -503,24 +661,53 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd) je->nr_pending = cpu_to_le32(je->nr_pending); je->files_open = cpu_to_le32(je->files_open); - for (i = 0; i < 2; i++) { + for (i = 0; i < DDIR_RWDIR_CNT; i++) { je->m_rate[i] = cpu_to_le32(je->m_rate[i]); je->t_rate[i] = cpu_to_le32(je->t_rate[i]); je->m_iops[i] = cpu_to_le32(je->m_iops[i]); je->t_iops[i] = cpu_to_le32(je->t_iops[i]); - je->rate[i] = cpu_to_le32(je->rate[i]); - je->iops[i] = cpu_to_le32(je->iops[i]); } je->elapsed_sec = cpu_to_le64(je->elapsed_sec); je->eta_sec = cpu_to_le64(je->eta_sec); je->nr_threads = cpu_to_le32(je->nr_threads); + je->is_pow2 = cpu_to_le32(je->is_pow2); - fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag); + fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, &tag, NULL); free(je); return 0; } +static int send_update_job_reply(int fd, uint64_t __tag, int error) +{ + uint64_t tag = __tag; + uint32_t pdu_error; + + pdu_error = __cpu_to_le32(error); + return fio_net_send_cmd(fd, FIO_NET_CMD_UPDATE_JOB, &pdu_error, sizeof(pdu_error), &tag, NULL); +} + +static int handle_update_job_cmd(struct fio_net_cmd *cmd) +{ + struct cmd_add_job_pdu *pdu = (struct cmd_add_job_pdu *) cmd->payload; + struct thread_data *td; + uint32_t tnumber; + + tnumber = le32_to_cpu(pdu->thread_number); + + dprint(FD_NET, "server: updating options for job %u\n", tnumber); + + if (!tnumber || tnumber > thread_number) { + send_update_job_reply(server_fd, cmd->tag, ENODEV); + return 0; + } + + td = &threads[tnumber - 1]; + convert_thread_options_to_cpu(&td->o, &pdu->top); + send_update_job_reply(server_fd, cmd->tag, 0); + return 0; +} + static int handle_command(struct fio_net_cmd *cmd) { int ret; @@ -550,19 +737,26 @@ static int handle_command(struct fio_net_cmd *cmd) case FIO_NET_CMD_RUN: ret = handle_run_cmd(cmd); break; + case FIO_NET_CMD_UPDATE_JOB: + ret = handle_update_job_cmd(cmd); + break; default: - log_err("fio: unknown opcode: %s\n",fio_server_op(cmd->opcode)); + log_err("fio: unknown opcode: %s\n", fio_server_op(cmd->opcode)); ret = 1; } return ret; } -static int handle_connection(int sk, int block) +static int handle_connection(int sk) { struct fio_net_cmd *cmd = NULL; int ret = 0; + reset_fio_state(); + INIT_FLIST_HEAD(&job_list); + server_fd = sk; + /* read forever */ while (!exit_backend) { struct pollfd pfd = { @@ -572,15 +766,19 @@ static int handle_connection(int sk, int block) ret = 0; do { - ret = poll(&pfd, 1, 100); + int timeout = 1000; + + if (!flist_empty(&job_list)) + timeout = 100; + + ret = poll(&pfd, 1, timeout); if (ret < 0) { if (errno == EINTR) break; log_err("fio: poll: %s\n", strerror(errno)); break; } else if (!ret) { - if (!block) - return 0; + fio_server_check_jobs(); continue; } @@ -592,6 +790,8 @@ static int handle_connection(int sk, int block) } } while (!exit_backend); + fio_server_check_jobs(); + if (ret < 0) break; @@ -612,70 +812,73 @@ static int handle_connection(int sk, int block) if (cmd) free(cmd); - return ret; -} - -void fio_server_idle_loop(void) -{ - if (!first_cmd_check) { - fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_SERVER_START, 0, NULL); - first_cmd_check = 1; - } - if (server_fd != -1) - handle_connection(server_fd, 0); + close(sk); + _exit(ret); } static int accept_loop(int listen_sk) { struct sockaddr_in addr; - fio_socklen_t len = sizeof(addr); + socklen_t len = sizeof(addr); struct pollfd pfd; - int ret, sk, flags, exitval = 0; + int ret = 0, 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); -again: - pfd.fd = listen_sk; - pfd.events = POLLIN; - do { - ret = poll(&pfd, 1, 100); - if (ret < 0) { - if (errno == EINTR) - break; - log_err("fio: poll: %s\n", strerror(errno)); - goto out; - } else if (!ret) - continue; - if (pfd.revents & POLLIN) - break; - } while (!exit_backend); + while (!exit_backend) { + pid_t pid; - if (exit_backend) - goto out; + pfd.fd = listen_sk; + pfd.events = POLLIN; + do { + int timeout = 1000; - sk = accept(listen_sk, (struct sockaddr *) &addr, &len); - if (sk < 0) { - log_err("fio: accept: %s\n", strerror(errno)); - return -1; - } + if (!flist_empty(&conn_list)) + timeout = 100; - dprint(FD_NET, "server: connect from %s\n", inet_ntoa(addr.sin_addr)); + ret = poll(&pfd, 1, timeout); + if (ret < 0) { + if (errno == EINTR) + break; + log_err("fio: poll: %s\n", strerror(errno)); + break; + } else if (!ret) { + fio_server_check_conns(); + continue; + } - server_fd = sk; + if (pfd.revents & POLLIN) + break; + } while (!exit_backend); - exitval = handle_connection(sk, 1); + fio_server_check_conns(); - server_fd = -1; - close(sk); + if (exit_backend || ret < 0) + break; + + sk = accept(listen_sk, (struct sockaddr *) &addr, &len); + if (sk < 0) { + log_err("fio: accept: %s\n", strerror(errno)); + return -1; + } - if (!exit_backend) - goto again; + dprint(FD_NET, "server: connect from %s\n", inet_ntoa(addr.sin_addr)); + + pid = fork(); + if (pid) { + close(sk); + fio_server_add_conn_pid(pid); + continue; + } + + /* exits */ + handle_connection(sk); + } -out: return exitval; } @@ -700,7 +903,7 @@ int fio_server_text_output(int level, const char *buf, size_t len) memcpy(pdu->buf, buf, len); - fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, pdu, tlen, 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, pdu, tlen, NULL, NULL); free(pdu); return len; } @@ -722,7 +925,7 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) { int i; - for (i = 0; i < 2; i++) { + for (i = 0; i < DDIR_RWDIR_CNT; i++) { dst->max_run[i] = cpu_to_le64(src->max_run[i]); dst->min_run[i] = cpu_to_le64(src->min_run[i]); dst->max_bw[i] = cpu_to_le64(src->max_bw[i]); @@ -733,6 +936,7 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) dst->kb_base = cpu_to_le32(src->kb_base); dst->groupid = cpu_to_le32(src->groupid); + dst->unified_rw_rep = cpu_to_le32(src->unified_rw_rep); } /* @@ -757,8 +961,9 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) p.ts.groupid = cpu_to_le32(ts->groupid); p.ts.pid = cpu_to_le32(ts->pid); p.ts.members = cpu_to_le32(ts->members); + p.ts.unified_rw_rep = cpu_to_le32(ts->unified_rw_rep); - for (i = 0; i < 2; i++) { + for (i = 0; i < DDIR_RWDIR_CNT; i++) { convert_io_stat(&p.ts.clat_stat[i], &ts->clat_stat[i]); convert_io_stat(&p.ts.slat_stat[i], &ts->slat_stat[i]); convert_io_stat(&p.ts.lat_stat[i], &ts->lat_stat[i]); @@ -790,11 +995,11 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) p.ts.io_u_lat_m[i] = cpu_to_le32(ts->io_u_lat_m[i]); } - for (i = 0; i < 2; i++) + for (i = 0; i < DDIR_RWDIR_CNT; i++) for (j = 0; j < FIO_IO_U_PLAT_NR; j++) p.ts.io_u_plat[i][j] = cpu_to_le32(ts->io_u_plat[i][j]); - for (i = 0; i < 3; i++) { + for (i = 0; i < DDIR_RWDIR_CNT; i++) { p.ts.total_io_u[i] = cpu_to_le64(ts->total_io_u[i]); p.ts.short_io_u[i] = cpu_to_le64(ts->short_io_u[i]); } @@ -802,7 +1007,7 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) p.ts.total_submit = cpu_to_le64(ts->total_submit); p.ts.total_complete = cpu_to_le64(ts->total_complete); - for (i = 0; i < 2; i++) { + for (i = 0; i < DDIR_RWDIR_CNT; i++) { p.ts.io_bytes[i] = cpu_to_le64(ts->io_bytes[i]); p.ts.runtime[i] = cpu_to_le64(ts->runtime[i]); } @@ -815,7 +1020,7 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) convert_gs(&p.rs, rs); - fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), NULL, NULL); } void fio_server_send_gs(struct group_run_stats *rs) @@ -825,7 +1030,7 @@ void fio_server_send_gs(struct group_run_stats *rs) 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), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs), NULL, NULL); } static void convert_agg(struct disk_util_agg *dst, struct disk_util_agg *src) @@ -879,7 +1084,7 @@ void fio_server_send_du(void) convert_dus(&pdu.dus, &du->dus); convert_agg(&pdu.agg, &du->agg); - fio_net_send_cmd(server_fd, FIO_NET_CMD_DU, &pdu, sizeof(pdu), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_DU, &pdu, sizeof(pdu), NULL, NULL); } } @@ -901,7 +1106,7 @@ static int fio_send_cmd_ext_pdu(int sk, uint16_t opcode, const void *buf, cmd.flags = __cpu_to_le32(flags); fio_net_cmd_crc_pdu(&cmd, buf); - return fio_sendv_data(server_fd, iov, 2); + return fio_sendv_data(sk, iov, 2); } int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name) @@ -990,13 +1195,20 @@ void fio_server_send_add_job(struct thread_data *td) pdu.groupid = cpu_to_le32(td->groupid); convert_thread_options_to_net(&pdu.top, &td->o); - fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), NULL, NULL); +} + +void fio_server_send_start(struct thread_data *td) +{ + assert(server_fd != -1); + + fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_SERVER_START, 0, NULL); } static int fio_init_server_ip(void) { struct sockaddr *addr; - fio_socklen_t socklen; + socklen_t socklen; int sk, opt; if (use_ipv6) @@ -1010,7 +1222,7 @@ static int fio_init_server_ip(void) } opt = 1; - if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)) < 0) { log_err("fio: setsockopt: %s\n", strerror(errno)); close(sk); return -1; @@ -1045,7 +1257,7 @@ static int fio_init_server_ip(void) static int fio_init_server_sock(void) { struct sockaddr_un addr; - fio_socklen_t len; + socklen_t len; mode_t mode; int sk; @@ -1380,7 +1592,7 @@ int fio_start_server(char *pidfile) #if defined(WIN32) WSADATA wsd; - WSAStartup(MAKEWORD(2,2), &wsd); + WSAStartup(MAKEWORD(2, 2), &wsd); #endif if (!pidfile)