X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=57745089becc04675969132e63604189b0069451;hp=a48842e6deeb9062008681c0169eb19c3c1d2cd4;hb=5037b845e0936730b5540955be64d9279ac8af9d;hpb=70e0c3166fdb8048b1e7f84be2371fc60af04f87 diff --git a/server.c b/server.c index a48842e6..57745089 100644 --- a/server.c +++ b/server.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "fio.h" #include "server.h" @@ -160,9 +161,11 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk, int block) 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); @@ -199,8 +202,17 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk, int block) 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; } @@ -258,20 +270,50 @@ 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; } @@ -282,9 +324,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)); } @@ -303,7 +348,10 @@ static int handle_command(struct fio_net_cmd *cmd) exit_backend = 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); @@ -351,11 +399,13 @@ void fio_server_idle_loop(void) static int accept_loop(int listen_sk) { - struct sockaddr addr; + struct sockaddr_in addr; unsigned int 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); @@ -379,13 +429,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; @@ -401,64 +451,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) @@ -497,6 +495,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); @@ -566,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)); } @@ -587,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); @@ -614,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); @@ -621,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();