X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=2aff0625092c78ab01229380460a9400cdf7d695;hp=32add58a85108eeb61aa3b2345fae73a76f078e5;hb=e951bdc47d094d43d6f41de95c6af191b8346459;hpb=cf451d1ede3bbbd2fed3619eb43def054d5b5a5a diff --git a/server.c b/server.c index 32add58a..2aff0625 100644 --- a/server.c +++ b/server.c @@ -8,15 +8,17 @@ #include #include #include -#include +#include #include #include #include #include +#include #include "fio.h" #include "server.h" #include "crc/crc16.h" +#include "ieee754.h" int fio_net_port = 8765; @@ -129,9 +131,11 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) if (ret) break; - if (first) - cmd_size = sizeof(cmd) + cmd.pdu_len; - else + if (first) { + /* if this is text, add room for \0 at the end */ + cmd_size = sizeof(cmd) + cmd.pdu_len + 1; + assert(!cmdret); + } else cmd_size += cmd.pdu_len; cmdret = realloc(cmdret, cmd_size); @@ -168,10 +172,17 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) if (ret) { free(cmdret); cmdret = NULL; - } + } else if (cmdret) { + /* zero-terminate text input */ + if (cmdret->pdu_len && (cmdret->opcode == FIO_NET_CMD_TEXT || + cmdret->opcode == FIO_NET_CMD_JOB)) { + char *buf = (char *) cmdret->payload; - if (cmdret) + buf[cmdret->pdu_len ] = '\0'; + } + /* frag flag is internal */ cmdret->flags &= ~FIO_NET_CMD_F_MORE; + } return cmdret; } @@ -216,7 +227,7 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size) return ret; } -static int send_simple_command(int sk, uint16_t opcode, uint64_t serial) +int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial) { struct fio_net_cmd cmd = { .version = __cpu_to_le16(FIO_SERVER_VER1), @@ -229,43 +240,74 @@ static int send_simple_command(int sk, uint16_t opcode, uint64_t serial) return fio_send_data(sk, &cmd, sizeof(cmd)); } -/* - * Send an ack for this command - */ -static int ack_command(int sk, struct fio_net_cmd *cmd) +static int fio_server_send_quit_cmd(void) { -#if 0 - return send_simple_command(sk, FIO_NET_CMD_ACK, cmd->serial); -#else - return 0; -#endif + dprint(FD_NET, "server: sending quit\n"); + return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0); } -#if 0 -static int nak_command(int sk, struct fio_net_cmd *cmd) +static int handle_job_cmd(struct fio_net_cmd *cmd) { - return send_simple_command(sk, FIO_NET_CMD_NAK, cmd->serial); -} -#endif + char *buf = (char *) cmd->payload; + int ret; -static int send_quit_command(void) -{ - dprint(FD_NET, "server: sending quit\n"); - return send_simple_command(server_fd, FIO_NET_CMD_QUIT, 0); + if (parse_jobs_ini(buf, 1, 0)) { + fio_server_send_quit_cmd(); + return -1; + } + + fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0); + + ret = exec_run(); + fio_server_send_quit_cmd(); + reset_fio_state(); + return ret; } -static int handle_cur_job(struct fio_net_cmd *cmd) +static int handle_jobline_cmd(struct fio_net_cmd *cmd) { - void *buf = cmd->payload; - int ret; + struct cmd_line_pdu *pdu = (struct cmd_line_pdu *) cmd->payload; + char *argv[FIO_NET_CMD_JOBLINE_ARGV]; + int ret, i; + + pdu->argc = le16_to_cpu(pdu->argc); + + 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)) { + fio_server_send_quit_cmd(); + return -1; + } + + fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0); - parse_jobs_ini(buf, 1, 0); ret = exec_run(); - send_quit_command(); + fio_server_send_quit_cmd(); reset_fio_state(); return ret; } +static int handle_probe_cmd(struct fio_net_cmd *cmd) +{ + struct cmd_probe_pdu probe; + + 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; + + return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe)); +} + static int handle_command(struct fio_net_cmd *cmd) { int ret; @@ -274,16 +316,19 @@ static int handle_command(struct fio_net_cmd *cmd) switch (cmd->opcode) { case FIO_NET_CMD_QUIT: - return 1; + fio_terminate_threads(TERMINATE_ALL); + return -1; case FIO_NET_CMD_EXIT: exit_backend = 1; - return 1; - case FIO_NET_CMD_ACK: - return 0; - case FIO_NET_CMD_NAK: - return 1; + return -1; case FIO_NET_CMD_JOB: - ret = handle_cur_job(cmd); + ret = handle_job_cmd(cmd); + break; + case FIO_NET_CMD_JOBLINE: + ret = handle_jobline_cmd(cmd); + break; + case FIO_NET_CMD_PROBE: + ret = handle_probe_cmd(cmd); break; default: log_err("fio: unknown opcode: %d\n", cmd->opcode); @@ -293,23 +338,46 @@ static int handle_command(struct fio_net_cmd *cmd) return ret; } -static int handle_connection(int sk) +static int handle_connection(int sk, int block) { struct fio_net_cmd *cmd = NULL; int ret = 0; /* read forever */ while (!exit_backend) { + struct pollfd pfd = { + .fd = sk, + .events = POLLIN, + }; + + ret = 0; + do { + ret = poll(&pfd, 1, 100); + if (ret < 0) { + if (errno == EINTR) + break; + log_err("fio: poll: %s\n", strerror(errno)); + break; + } else if (!ret) + continue; + + if (pfd.revents & POLLIN) + break; + if (pfd.revents & (POLLERR|POLLHUP)) { + ret = 1; + break; + } + } while (1); + + if (ret < 0) + break; + cmd = fio_net_recv_cmd(sk); if (!cmd) { - ret = 1; + ret = -1; break; } - ret = ack_command(sk, cmd); - if (ret) - break; - ret = handle_command(cmd); if (ret) break; @@ -324,13 +392,21 @@ static int handle_connection(int sk) return ret; } +void fio_server_idle_loop(void) +{ + if (server_fd != -1) + handle_connection(server_fd, 0); +} + 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); @@ -354,17 +430,17 @@ 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; - exitval = handle_connection(sk); + exitval = handle_connection(sk, 1); server_fd = -1; close(sk); @@ -376,64 +452,12 @@ out: return exitval; } -static int fio_server(void) -{ - struct sockaddr_in saddr_in; - struct sockaddr addr; - unsigned int len; - int sk, opt, ret; - - dprint(FD_NET, "starting server\n"); - - sk = socket(AF_INET, SOCK_STREAM, 0); - if (sk < 0) { - log_err("fio: socket: %s\n", strerror(errno)); - return -1; - } - - opt = 1; - if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { - log_err("fio: setsockopt: %s\n", strerror(errno)); - return -1; - } -#ifdef SO_REUSEPORT - if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) { - log_err("fio: setsockopt: %s\n", strerror(errno)); - return 1; - } -#endif - - saddr_in.sin_family = AF_INET; - saddr_in.sin_addr.s_addr = htonl(INADDR_ANY); - saddr_in.sin_port = htons(fio_net_port); - - if (bind(sk, (struct sockaddr *) &saddr_in, sizeof(saddr_in)) < 0) { - log_err("fio: bind: %s\n", strerror(errno)); - return -1; - } - - if (listen(sk, 1) < 0) { - log_err("fio: listen: %s\n", strerror(errno)); - return -1; - } - - len = sizeof(addr); - if (getsockname(sk, &addr, &len) < 0) { - log_err("fio: getsockname: %s\n", strerror(errno)); - return -1; - } - - ret = accept_loop(sk); - close(sk); - return ret; -} - 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) @@ -441,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) @@ -472,6 +499,10 @@ 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); strcpy(p.ts.verror, ts->verror); strcpy(p.ts.description, ts->description); @@ -494,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]); @@ -513,10 +549,10 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) for (i = 0; i < 3; 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->total_io_u[i]); + p.ts.short_io_u[i] = cpu_to_le64(ts->short_io_u[i]); } - p.ts.total_submit = cpu_to_le64(ts->total_submit); + 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++) { @@ -539,36 +575,50 @@ 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)); } void fio_server_send_status(void) { - struct jobs_eta je; + struct jobs_eta *je; + size_t size; + void *buf; int i; - if (!calc_thread_status(&je)) + size = sizeof(*je) + thread_number * sizeof(char); + buf = malloc(size); + memset(buf, 0, size); + je = buf; + + if (!calc_thread_status(je)) { + free(je); return; + } - 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); - je.files_open = cpu_to_le32(je.files_open); - je.m_rate = cpu_to_le32(je.m_rate); - je.t_rate = cpu_to_le32(je.t_rate); - je.m_iops = cpu_to_le32(je.m_iops); - je.t_iops = cpu_to_le32(je.t_iops); + 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); + je->files_open = cpu_to_le32(je->files_open); + je->m_rate = cpu_to_le32(je->m_rate); + je->t_rate = cpu_to_le32(je->t_rate); + je->m_iops = cpu_to_le32(je->m_iops); + je->t_iops = cpu_to_le32(je->t_iops); for (i = 0; i < 2; i++) { - je.rate[i] = cpu_to_le32(je.rate[i]); - je.iops[i] = cpu_to_le32(je.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_le32(je.nr_running); - je.eta_sec = cpu_to_le64(je.eta_sec); + je->elapsed_sec = cpu_to_le32(je->nr_running); + je->eta_sec = cpu_to_le64(je->eta_sec); - fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, &je, sizeof(je)); + fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, buf, size); + free(je); } int fio_server_log(const char *format, ...) @@ -577,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); @@ -584,10 +636,85 @@ int fio_server_log(const char *format, ...) return fio_server_text_output(buffer, len); } +static int fio_server(void) +{ + struct sockaddr_in saddr_in; + struct sockaddr addr; + fio_socklen_t len; + int sk, opt, ret; + + dprint(FD_NET, "starting server\n"); + + sk = socket(AF_INET, SOCK_STREAM, 0); + if (sk < 0) { + log_err("fio: socket: %s\n", strerror(errno)); + return -1; + } + + opt = 1; + if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + log_err("fio: setsockopt: %s\n", strerror(errno)); + return -1; + } +#ifdef SO_REUSEPORT + if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) { + log_err("fio: setsockopt: %s\n", strerror(errno)); + return -1; + } +#endif + + saddr_in.sin_family = AF_INET; + saddr_in.sin_addr.s_addr = htonl(INADDR_ANY); + saddr_in.sin_port = htons(fio_net_port); + + if (bind(sk, (struct sockaddr *) &saddr_in, sizeof(saddr_in)) < 0) { + log_err("fio: bind: %s\n", strerror(errno)); + return -1; + } + + if (listen(sk, 1) < 0) { + log_err("fio: listen: %s\n", strerror(errno)); + return -1; + } + + len = sizeof(addr); + if (getsockname(sk, &addr, &len) < 0) { + log_err("fio: getsockname: %s\n", strerror(errno)); + return -1; + } + + ret = accept_loop(sk); + close(sk); + return ret; +} + +static void sig_int(int sig) +{ + fio_terminate_threads(TERMINATE_ALL); + exit_backend = 1; +} + +static void server_signal_handler(void) +{ + struct sigaction act; + + memset(&act, 0, sizeof(act)); + act.sa_handler = sig_int; + act.sa_flags = SA_RESTART; + sigaction(SIGINT, &act, NULL); + + memset(&act, 0, sizeof(act)); + act.sa_handler = sig_int; + act.sa_flags = SA_RESTART; + sigaction(SIGTERM, &act, NULL); +} + int fio_start_server(int daemonize) { pid_t pid; + server_signal_handler(); + if (!daemonize) return fio_server(); @@ -595,7 +722,7 @@ int fio_start_server(int daemonize) pid = fork(); if (pid < 0) { syslog(LOG_ERR, "failed server fork"); - return 1; + return -1; } else if (pid) exit(0);