X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=dd0aeb3cb8d320e18a3ac6d3a7e4b1ac24f60796;hp=3008b8bc91bd29bc05025a64e12e6bfd112774ab;hb=6eb2479194603184f393057ea10326643edc7169;hpb=93eee04aef9ed39070ce2e69bd1f661a95b1d50a diff --git a/server.c b/server.c index 3008b8bc..dd0aeb3c 100644 --- a/server.c +++ b/server.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "fio.h" #include "server.h" @@ -111,7 +112,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) +struct fio_net_cmd *fio_net_recv_cmd(int sk, int block) { struct fio_net_cmd cmd, *cmdret = NULL; size_t cmd_size = 0, pdu_offset = 0; @@ -126,12 +127,19 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) pfd.events = POLLIN; ret = 0; do { - ret = poll(&pfd, 1, 100); + 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) + } else if (!ret) { + if (!block) + return NULL; continue; + } if (pfd.revents & POLLIN) break; @@ -139,7 +147,7 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) ret = 1; break; } - } while (ret >= 0); + } while (ret >= 0 && block); if (ret < 0) break; @@ -153,9 +161,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); @@ -192,8 +202,17 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) if (ret) { free(cmdret); cmdret = NULL; - } else if (cmdret) + } 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; + + buf[cmdret->pdu_len ] = '\0'; + } + /* frag flag is internal */ cmdret->flags &= ~FIO_NET_CMD_F_MORE; + } return cmdret; } @@ -251,24 +270,70 @@ 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); } -static int handle_cur_job(struct fio_net_cmd *cmd) +static int handle_job_cmd(struct fio_net_cmd *cmd) { - void *buf = cmd->payload; + char *buf = (char *) cmd->payload; int ret; - parse_jobs_ini(buf, 1, 0); + if (parse_jobs_ini(buf, 1, 0)) + 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_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)) + 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_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; @@ -278,16 +343,18 @@ static int handle_command(struct fio_net_cmd *cmd) switch (cmd->opcode) { case FIO_NET_CMD_QUIT: fio_terminate_threads(TERMINATE_ALL); - return 1; + 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); @@ -297,16 +364,16 @@ 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) { - cmd = fio_net_recv_cmd(sk); + cmd = fio_net_recv_cmd(sk, block); if (!cmd) { - ret = 1; + ret = -1; break; } @@ -327,7 +394,7 @@ static int handle_connection(int sk) void fio_server_idle_loop(void) { if (server_fd != -1) - handle_connection(server_fd); + handle_connection(server_fd, 0); } static int accept_loop(int listen_sk) @@ -337,6 +404,8 @@ static int accept_loop(int listen_sk) 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); @@ -370,11 +439,7 @@ again: server_fd = sk; - printf("handle\n"); - - exitval = handle_connection(sk); - - printf("out, exit %d\n", exitval); + exitval = handle_connection(sk, 1); server_fd = -1; close(sk); @@ -386,58 +451,6 @@ 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) @@ -482,6 +495,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); @@ -549,6 +566,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)); } @@ -570,6 +589,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); @@ -597,6 +618,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); @@ -604,10 +627,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; + 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(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(); @@ -615,7 +713,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);