X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.c;h=8b91d26fe328c6577af7a4eace788dd8cb2bc16d;hb=c3a5b6dc837031d429408a33124a027bf75604d7;hp=d5733c4e05901a4f720e07e217320486d24e4138;hpb=122c772599f1b0a3148a5790775698d3fa92cc10;p=fio.git diff --git a/server.c b/server.c index d5733c4e..8b91d26f 100644 --- a/server.c +++ b/server.c @@ -276,7 +276,7 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmdret->payload; char *buf = (char *) pdu->buf; - buf[pdu->buf_len ] = '\0'; + buf[pdu->buf_len] = '\0'; } else if (cmdret->opcode == FIO_NET_CMD_JOB) { struct cmd_job_pdu *pdu = (struct cmd_job_pdu *) cmdret->payload; char *buf = (char *) pdu->buf; @@ -293,6 +293,33 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) return cmdret; } +static void add_reply(uint64_t tag, struct flist_head *list) +{ + struct fio_net_cmd_reply *reply = (struct fio_net_cmd_reply *) tag; + + flist_add_tail(&reply->list, list); +} + +static uint64_t alloc_reply(uint64_t tag, uint16_t opcode) +{ + struct fio_net_cmd_reply *reply; + + reply = calloc(1, sizeof(*reply)); + INIT_FLIST_HEAD(&reply->list); + gettimeofday(&reply->tv, NULL); + reply->saved_tag = tag; + reply->opcode = opcode; + + return (uintptr_t) reply; +} + +static void free_reply(uint64_t tag) +{ + struct fio_net_cmd_reply *reply = (struct fio_net_cmd_reply *) tag; + + free(reply); +} + void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, const void *pdu) { uint32_t pdu_len; @@ -309,12 +336,19 @@ void fio_net_cmd_crc(struct fio_net_cmd *cmd) } int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size, - uint64_t tag) + uint64_t *tagptr, struct flist_head *list) { struct fio_net_cmd *cmd = NULL; size_t this_len, cur_len = 0; + uint64_t tag; int ret; + if (list) { + assert(tagptr); + tag = *tagptr = alloc_reply(*tagptr, opcode); + } else + tag = tagptr ? *tagptr : 0; + do { this_len = size; if (this_len > FIO_SERVER_MAX_FRAGMENT_PDU) @@ -340,6 +374,13 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size, buf += this_len; } while (!ret && size); + if (list) { + if (ret) + free_reply(tag); + else + add_reply(tag, list); + } + if (cmd) free(cmd); @@ -363,28 +404,22 @@ static int fio_net_send_simple_stack_cmd(int sk, uint16_t opcode, uint64_t tag) int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag, struct flist_head *list) { - struct fio_net_int_cmd *cmd; int ret; - if (!list) - return fio_net_send_simple_stack_cmd(sk, opcode, tag); - - cmd = malloc(sizeof(*cmd)); + if (list) + tag = alloc_reply(tag, opcode); - fio_init_net_cmd(&cmd->cmd, opcode, NULL, 0, (uintptr_t) cmd); - fio_net_cmd_crc(&cmd->cmd); - - INIT_FLIST_HEAD(&cmd->list); - gettimeofday(&cmd->tv, NULL); - cmd->saved_tag = tag; - - ret = fio_send_data(sk, &cmd->cmd, sizeof(cmd->cmd)); + ret = fio_net_send_simple_stack_cmd(sk, opcode, tag); if (ret) { - free(cmd); + if (list) + free_reply(tag); + return ret; } - flist_add_tail(&cmd->list, list); + if (list) + add_reply(tag, list); + return 0; } @@ -392,18 +427,27 @@ int fio_net_send_quit(int sk) { dprint(FD_NET, "server: sending quit\n"); - return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0, NULL); + return fio_net_send_simple_cmd(sk, FIO_NET_CMD_QUIT, 0, NULL); } -int fio_net_send_stop(int sk, int error, int signal) +static int fio_net_send_ack(int sk, struct fio_net_cmd *cmd, int error, + int signal) { struct cmd_end_pdu epdu; + uint64_t tag = 0; - dprint(FD_NET, "server: sending stop (%d, %d)\n", error, signal); + if (cmd) + tag = cmd->tag; epdu.error = __cpu_to_le32(error); epdu.signal = __cpu_to_le32(signal); - return fio_net_send_cmd(server_fd, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), 0); + return fio_net_send_cmd(sk, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), &tag, NULL); +} + +int fio_net_send_stop(int sk, int error, int signal) +{ + dprint(FD_NET, "server: sending stop (%d, %d)\n", error, signal); + return fio_net_send_ack(sk, NULL, error, signal); } static void fio_server_add_fork_item(pid_t pid, struct flist_head *list) @@ -467,7 +511,7 @@ static void fio_server_fork_item_done(struct fio_fork_item *ffi) free(ffi); } -static void fio_server_check_fork_items(struct flist_head *list, int bla) +static void fio_server_check_fork_items(struct flist_head *list) { struct flist_head *entry, *tmp; struct fio_fork_item *ffi; @@ -484,12 +528,12 @@ static void fio_server_check_fork_items(struct flist_head *list, int bla) static void fio_server_check_jobs(void) { - fio_server_check_fork_items(&job_list, 0); + fio_server_check_fork_items(&job_list); } static void fio_server_check_conns(void) { - fio_server_check_fork_items(&conn_list, 1); + fio_server_check_fork_items(&conn_list); } static int handle_run_cmd(struct fio_net_cmd *cmd) @@ -524,7 +568,7 @@ static int handle_job_cmd(struct fio_net_cmd *cmd) } spdu.jobs = cpu_to_le32(thread_number); - fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), NULL, NULL); return 0; } @@ -563,13 +607,14 @@ static int handle_jobline_cmd(struct fio_net_cmd *cmd) free(argv); spdu.jobs = cpu_to_le32(thread_number); - fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), NULL, NULL); return 0; } static int handle_probe_cmd(struct fio_net_cmd *cmd) { struct cmd_probe_pdu probe; + uint64_t tag = cmd->tag; dprint(FD_NET, "server: sending probe reply\n"); @@ -587,13 +632,14 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd) probe.bpp = sizeof(void *); - return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), cmd->tag); + return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), &tag, NULL); } static int handle_send_eta_cmd(struct fio_net_cmd *cmd) { struct jobs_eta *je; size_t size; + uint64_t tag = cmd->tag; int i; if (!thread_number) @@ -628,11 +674,41 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd) je->eta_sec = cpu_to_le64(je->eta_sec); je->nr_threads = cpu_to_le32(je->nr_threads); - fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag); + fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, &tag, NULL); free(je); return 0; } +static int send_update_job_reply(int fd, uint64_t __tag, int error) +{ + uint64_t tag = __tag; + uint32_t pdu_error; + + pdu_error = __cpu_to_le32(error); + return fio_net_send_cmd(fd, FIO_NET_CMD_UPDATE_JOB, &pdu_error, sizeof(pdu_error), &tag, NULL); +} + +static int handle_update_job_cmd(struct fio_net_cmd *cmd) +{ + struct cmd_add_job_pdu *pdu = (struct cmd_add_job_pdu *) cmd->payload; + struct thread_data *td; + uint32_t tnumber; + + tnumber = le32_to_cpu(pdu->thread_number); + + dprint(FD_NET, "server: updating options for job %u\n", tnumber); + + if (!tnumber || tnumber > thread_number) { + send_update_job_reply(server_fd, cmd->tag, ENODEV); + return 0; + } + + td = &threads[tnumber - 1]; + convert_thread_options_to_cpu(&td->o, &pdu->top); + send_update_job_reply(server_fd, cmd->tag, 0); + return 0; +} + static int handle_command(struct fio_net_cmd *cmd) { int ret; @@ -662,8 +738,11 @@ static int handle_command(struct fio_net_cmd *cmd) case FIO_NET_CMD_RUN: ret = handle_run_cmd(cmd); break; + case FIO_NET_CMD_UPDATE_JOB: + ret = handle_update_job_cmd(cmd); + break; default: - log_err("fio: unknown opcode: %s\n",fio_server_op(cmd->opcode)); + log_err("fio: unknown opcode: %s\n", fio_server_op(cmd->opcode)); ret = 1; } @@ -688,7 +767,12 @@ static int handle_connection(int sk) ret = 0; do { - ret = poll(&pfd, 1, 100); + int timeout = 1000; + + if (!flist_empty(&job_list)) + timeout = 100; + + ret = poll(&pfd, 1, timeout); if (ret < 0) { if (errno == EINTR) break; @@ -752,7 +836,12 @@ static int accept_loop(int listen_sk) pfd.fd = listen_sk; pfd.events = POLLIN; do { - ret = poll(&pfd, 1, 100); + int timeout = 1000; + + if (!flist_empty(&conn_list)) + timeout = 100; + + ret = poll(&pfd, 1, timeout); if (ret < 0) { if (errno == EINTR) break; @@ -815,7 +904,7 @@ int fio_server_text_output(int level, const char *buf, size_t len) memcpy(pdu->buf, buf, len); - fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, pdu, tlen, 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, pdu, tlen, NULL, NULL); free(pdu); return len; } @@ -930,7 +1019,7 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) convert_gs(&p.rs, rs); - fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), NULL, NULL); } void fio_server_send_gs(struct group_run_stats *rs) @@ -940,7 +1029,7 @@ void fio_server_send_gs(struct group_run_stats *rs) 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), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs), NULL, NULL); } static void convert_agg(struct disk_util_agg *dst, struct disk_util_agg *src) @@ -994,7 +1083,7 @@ void fio_server_send_du(void) convert_dus(&pdu.dus, &du->dus); convert_agg(&pdu.agg, &du->agg); - fio_net_send_cmd(server_fd, FIO_NET_CMD_DU, &pdu, sizeof(pdu), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_DU, &pdu, sizeof(pdu), NULL, NULL); } } @@ -1016,7 +1105,7 @@ static int fio_send_cmd_ext_pdu(int sk, uint16_t opcode, const void *buf, cmd.flags = __cpu_to_le32(flags); fio_net_cmd_crc_pdu(&cmd, buf); - return fio_sendv_data(server_fd, iov, 2); + return fio_sendv_data(sk, iov, 2); } int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name) @@ -1105,7 +1194,7 @@ void fio_server_send_add_job(struct thread_data *td) pdu.groupid = cpu_to_le32(td->groupid); convert_thread_options_to_net(&pdu.top, &td->o); - fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), 0); + fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), NULL, NULL); } void fio_server_send_start(struct thread_data *td) @@ -1502,7 +1591,7 @@ int fio_start_server(char *pidfile) #if defined(WIN32) WSADATA wsd; - WSAStartup(MAKEWORD(2,2), &wsd); + WSAStartup(MAKEWORD(2, 2), &wsd); #endif if (!pidfile)