X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=1e2fcd06c4b323bf99aa040b9feccfbe7b44ec76;hp=5e94696eb6aa6ee79d34668723b3981f1384d4dd;hb=084d1c6f817eacaaefa1de4f0637ef6c1405d74b;hpb=25dfa848abbb6c35b4d45fabd5a8e82cb77fb285 diff --git a/server.c b/server.c index 5e94696e..1e2fcd06 100644 --- a/server.c +++ b/server.c @@ -24,7 +24,7 @@ #include "fio_version.h" -int fio_net_port = 8765; +int fio_net_port = FIO_NET_PORT; int exit_backend = 0; @@ -52,6 +52,7 @@ static const char *fio_server_ops[FIO_NET_CMD_NR] = { "STOP", "DISK_UTIL", "RUN", + "ADD_JOB", }; const char *fio_server_op(unsigned int op) @@ -221,12 +222,19 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) 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->pdu_len) { + if (cmdret->opcode == FIO_NET_CMD_TEXT) { + struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmdret->payload; + char *buf = (char *) pdu->buf; - buf[cmdret->pdu_len ] = '\0'; + buf[pdu->buf_len ] = '\0'; + } else if (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; } @@ -353,6 +361,7 @@ static int handle_job_cmd(struct fio_net_cmd *cmd) fio_server_send_quit_cmd(); reset_fio_state(); + first_cmd_check = 0; return ret; } @@ -393,6 +402,7 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd) ret = fio_backend(); fio_server_send_quit_cmd(); reset_fio_state(); + first_cmd_check = 0; return ret; } @@ -443,12 +453,12 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd) 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->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]); } @@ -554,8 +564,10 @@ static int handle_connection(int sk, int block) void fio_server_idle_loop(void) { - if (!first_cmd_check) + if (!first_cmd_check) { fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_RUN, 0, NULL); + first_cmd_check = 1; + } if (server_fd != -1) handle_connection(server_fd, 0); } @@ -614,12 +626,30 @@ out: return exitval; } -int fio_server_text_output(const char *buf, size_t len) +int fio_server_text_output(int level, const char *buf, size_t len) { - if (server_fd != -1) - return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len, 0); + struct cmd_text_pdu *pdu; + unsigned int tlen; + struct timeval tv; + + if (server_fd == -1) + return log_local_buf(buf, len); + + tlen = sizeof(*pdu) + len; + pdu = malloc(tlen); + + pdu->level = __cpu_to_le32(level); + pdu->buf_len = __cpu_to_le32(len); + + gettimeofday(&tv, NULL); + pdu->log_sec = __cpu_to_le64(tv.tv_sec); + pdu->log_usec = __cpu_to_le64(tv.tv_usec); + + memcpy(pdu->buf, buf, len); - return log_local_buf(buf, len); + fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, pdu, tlen, 0); + free(pdu); + return len; } static void convert_io_stat(struct io_stat *dst, struct io_stat *src) @@ -799,19 +829,26 @@ void fio_server_send_du(void) } } -int fio_server_log(const char *format, ...) +void fio_server_send_add_job(struct thread_options *o, const char *ioengine) { - char buffer[1024]; - va_list args; - size_t len; + struct cmd_add_job_pdu pdu; + int i; + + strcpy((char *) pdu.jobname, o->name); + strcpy((char *) pdu.ioengine, ioengine); + + pdu.iodepth = cpu_to_le32(o->iodepth); + pdu.rw = cpu_to_le32(o->td_ddir); - dprint(FD_NET, "server log\n"); + for (i = 0; i < 2; i++) { + pdu.min_bs[i] = cpu_to_le32(o->min_bs[i]); + pdu.max_bs[i] = cpu_to_le32(o->max_bs[i]); + } - va_start(args, format); - len = vsnprintf(buffer, sizeof(buffer), format, args); - va_end(args); + pdu.numjobs = cpu_to_le32(o->numjobs); + pdu.group_reporting = cpu_to_le32(o->group_reporting); - return fio_server_text_output(buffer, len); + fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), 0); } static int fio_init_server_ip(void) @@ -943,6 +980,46 @@ static int fio_init_server_connection(void) return sk; } +int fio_server_parse_host(const char *host, int *ipv6, struct in_addr *inp, + struct in6_addr *inp6) + +{ + int ret = 0; + + if (*ipv6) + ret = inet_pton(AF_INET6, host, inp6); + else + ret = inet_pton(AF_INET, host, inp); + + if (ret != 1) { + struct hostent *hent; + + hent = gethostbyname(host); + if (!hent) { + log_err("fio: failed to resolve <%s>\n", host); + return 0; + } + + if (*ipv6) { + if (hent->h_addrtype != AF_INET6) { + log_info("fio: falling back to IPv4\n"); + *ipv6 = 0; + } else + memcpy(inp6, hent->h_addr_list[0], 16); + } + if (!*ipv6) { + if (hent->h_addrtype != AF_INET) { + log_err("fio: lookup type mismatch\n"); + return 0; + } + memcpy(inp, hent->h_addr_list[0], 4); + } + ret = 1; + } + + return !(ret == 1); +} + /* * Parse a host/ip/port string. Reads from 'str'. * @@ -961,7 +1038,7 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock, { const char *host = str; char *portp; - int ret, lport = 0; + int lport = 0; *ptr = NULL; *is_sock = 0; @@ -1022,38 +1099,10 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock, *ptr = strdup(host); - if (*ipv6) - ret = inet_pton(AF_INET6, host, inp6); - else - ret = inet_pton(AF_INET, host, inp); - - if (ret != 1) { - struct hostent *hent; - - hent = gethostbyname(host); - if (!hent) { - log_err("fio: failed to resolve <%s>\n", host); - free(*ptr); - *ptr = NULL; - return 1; - } - - if (*ipv6) { - if (hent->h_addrtype != AF_INET6) { - log_info("fio: falling back to IPv4\n"); - *ipv6 = 0; - } else - memcpy(inp6, hent->h_addr_list[0], 16); - } - if (!*ipv6) { - if (hent->h_addrtype != AF_INET) { - log_err("fio: lookup type mismatch\n"); - free(*ptr); - *ptr = NULL; - return 1; - } - memcpy(inp, hent->h_addr_list[0], 4); - } + if (fio_server_parse_host(*ptr, ipv6, inp, inp6)) { + free(*ptr); + *ptr = NULL; + return 1; } if (*port == 0)