X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.c;h=6f216d5d1aa83d794b75ca94e2c9668a196ea86b;hb=19c65179fad3e0a32a450401ba7d312169627fdd;hp=a8b8258bc89bb897e9226ac9d6eb59f673b1d86a;hpb=0b8f30a5691b9e600a06ded035996e79c2100d77;p=fio.git diff --git a/server.c b/server.c index a8b8258b..6f216d5d 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; @@ -111,7 +113,7 @@ static int verify_convert_cmd(struct fio_net_cmd *cmd) /* * Read (and defragment, if necessary) incoming commands */ -struct fio_net_cmd *fio_net_recv_cmd(int sk, int block) +struct fio_net_cmd *fio_net_recv_cmd(int sk) { struct fio_net_cmd cmd, *cmdret = NULL; size_t cmd_size = 0, pdu_offset = 0; @@ -120,37 +122,6 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk, int block) void *pdu = NULL; do { - struct pollfd pfd; - - pfd.fd = sk; - pfd.events = POLLIN; - ret = 0; - do { - int timeo = block ? 100 : 10; - - ret = poll(&pfd, 1, timeo); - if (ret < 0) { - if (errno == EINTR) - break; - log_err("fio: poll: %s\n", strerror(errno)); - break; - } else if (!ret) { - if (!block) - return NULL; - continue; - } - - if (pfd.revents & POLLIN) - break; - if (pfd.revents & (POLLERR|POLLHUP)) { - ret = 1; - break; - } - } while (ret >= 0 && block); - - if (ret < 0) - break; - ret = fio_recv_data(sk, &cmd, sizeof(cmd)); if (ret) break; @@ -269,7 +240,7 @@ int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial) return fio_send_data(sk, &cmd, sizeof(cmd)); } -static int send_quit_command(void) +static int fio_server_send_quit_cmd(void) { dprint(FD_NET, "server: sending quit\n"); return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0); @@ -280,9 +251,43 @@ static int handle_job_cmd(struct fio_net_cmd *cmd) char *buf = (char *) cmd->payload; int ret; - parse_jobs_ini(buf, 1, 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(); - send_quit_command(); + fio_server_send_quit_cmd(); + reset_fio_state(); + return ret; +} + +static int handle_jobline_cmd(struct fio_net_cmd *cmd) +{ + 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); + + ret = exec_run(); + fio_server_send_quit_cmd(); reset_fio_state(); return ret; } @@ -293,9 +298,12 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd) memset(&probe, 0, sizeof(probe)); gethostname((char *) probe.hostname, sizeof(probe.hostname)); - probe.fio_major = 1; - probe.fio_minor = 58; - probe.fio_patch = 0; +#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)); } @@ -316,6 +324,9 @@ static int handle_command(struct fio_net_cmd *cmd) case FIO_NET_CMD_JOB: 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; @@ -334,7 +345,37 @@ static int handle_connection(int sk, int block) /* read forever */ while (!exit_backend) { - cmd = fio_net_recv_cmd(sk, block); + 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) { + if (!block) + return 0; + continue; + } + + if (pfd.revents & POLLIN) + break; + if (pfd.revents & (POLLERR|POLLHUP)) { + ret = 1; + break; + } + } while (!exit_backend); + + if (ret < 0) + break; + + cmd = fio_net_recv_cmd(sk); if (!cmd) { ret = -1; break; @@ -362,11 +403,13 @@ void fio_server_idle_loop(void) 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); @@ -390,13 +433,13 @@ 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; @@ -412,64 +455,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) @@ -477,9 +468,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) @@ -508,6 +502,8 @@ 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); @@ -532,7 +528,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]); @@ -577,6 +578,8 @@ 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)); } @@ -598,6 +601,8 @@ void fio_server_send_status(void) return; } + 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); @@ -625,6 +630,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); @@ -632,10 +639,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();