X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=7bd5284dd9c60c5aaae7a5351e9382d4eff11b5a;hb=e65a950ab73d7d91f267ad7f7b084d94e266fcb0;hp=f7b050b0253dc2a644898326cce6e50ab4658063;hpb=f5ed765adadc5dca61efb5fc103fa5cd0310bcec;p=fio.git diff --git a/client.c b/client.c index f7b050b0..7bd5284d 100644 --- a/client.c +++ b/client.c @@ -111,6 +111,10 @@ void fio_put_client(struct fio_client *client) free(client->argv); if (client->name) free(client->name); + while (client->nr_ini_file) + free(client->ini_file[--client->nr_ini_file]); + if (client->ini_file) + free(client->ini_file); free(client); } @@ -131,6 +135,12 @@ static void remove_client(struct fio_client *client) fio_client_dec_jobs_eta(client->eta_in_flight, client->ops->eta); } + close(client->fd); + client->fd = -1; + + if (client->ops->removed) + client->ops->removed(client); + nr_clients--; sum_stat_clients--; @@ -221,6 +231,19 @@ err: return NULL; } +void fio_client_add_ini_file(void *cookie, const char *ini_file) +{ + struct fio_client *client = cookie; + size_t new_size; + + dprint(FD_NET, "client <%s>: add ini %s\n", client->hostname, ini_file); + + new_size = (client->nr_ini_file + 1) * sizeof(char *); + client->ini_file = realloc(client->ini_file, new_size); + client->ini_file[client->nr_ini_file] = strdup(ini_file); + client->nr_ini_file++; +} + int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie) { struct fio_client *existing = *cookie; @@ -371,9 +394,9 @@ int fio_client_connect(struct fio_client *client) return 0; } -void fio_client_terminate(struct fio_client *client) +int fio_client_terminate(struct fio_client *client) { - fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_QUIT, 0, NULL); + return fio_net_send_quit(client->fd); } void fio_clients_terminate(void) @@ -395,6 +418,11 @@ static void sig_int(int sig) fio_clients_terminate(); } +static void sig_show_status(int sig) +{ + show_running_run_stats(); +} + static void client_signal_handler(void) { struct sigaction act; @@ -408,6 +436,11 @@ static void client_signal_handler(void) act.sa_handler = sig_int; act.sa_flags = SA_RESTART; sigaction(SIGTERM, &act, NULL); + + memset(&act, 0, sizeof(act)); + act.sa_handler = sig_show_status; + act.sa_flags = SA_RESTART; + sigaction(SIGUSR1, &act, NULL); } static int send_client_cmd_line(struct fio_client *client) @@ -453,7 +486,7 @@ static int send_client_cmd_line(struct fio_client *client) free(lens); clp->lines = cpu_to_le16(client->argc); clp->client_type = __cpu_to_le16(client->type); - ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem, 0); + ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem, NULL, NULL); free(pdu); return ret; } @@ -466,7 +499,7 @@ int fio_clients_connect(void) #ifdef WIN32 WSADATA wsd; - WSAStartup(MAKEWORD(2,2), &wsd); + WSAStartup(MAKEWORD(2, 2), &wsd); #endif dprint(FD_NET, "client: connect all\n"); @@ -579,7 +612,7 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename pdu->client_type = cpu_to_le32(client->type); client->sent_job = 1; - ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, pdu, p_size, 0); + ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, pdu, p_size, NULL, NULL); free(pdu); close(fd); return ret; @@ -604,13 +637,36 @@ int fio_clients_send_ini(const char *filename) flist_for_each_safe(entry, tmp, &client_list) { client = flist_entry(entry, struct fio_client, list); - if (fio_client_send_ini(client, filename)) + if (client->nr_ini_file) { + int i; + + for (i = 0; i < client->nr_ini_file; i++) { + const char *ini = client->ini_file[i]; + + if (fio_client_send_ini(client, ini)) { + remove_client(client); + break; + } + } + } else if (!filename || fio_client_send_ini(client, filename)) remove_client(client); } return !nr_clients; } +int fio_client_update_options(struct fio_client *client, + struct thread_options *o, uint64_t *tag) +{ + struct cmd_add_job_pdu pdu; + + pdu.thread_number = cpu_to_le32(client->thread_number); + pdu.groupid = cpu_to_le32(client->groupid); + convert_thread_options_to_net(&pdu.top, o); + + return fio_net_send_cmd(client->fd, FIO_NET_CMD_UPDATE_JOB, &pdu, sizeof(pdu), tag, &client->cmd_list); +} + static void convert_io_stat(struct io_stat *dst, struct io_stat *src) { dst->max_val = le64_to_cpu(src->max_val); @@ -628,10 +684,11 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) { int i, j; - dst->error = le32_to_cpu(src->error); - dst->groupid = le32_to_cpu(src->groupid); - dst->pid = le32_to_cpu(src->pid); - dst->members = le32_to_cpu(src->members); + dst->error = le32_to_cpu(src->error); + dst->thread_number = le32_to_cpu(src->thread_number); + dst->groupid = le32_to_cpu(src->groupid); + dst->pid = le32_to_cpu(src->pid); + dst->members = le32_to_cpu(src->members); for (i = 0; i < 2; i++) { convert_io_stat(&dst->clat_stat[i], &src->clat_stat[i]); @@ -719,6 +776,7 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) sum_group_stats(&client_gs, &p->rs); client_ts.members++; + client_ts.thread_number = p->ts.thread_number; client_ts.groupid = p->ts.groupid; if (++sum_stat_nr == sum_stat_clients) { @@ -792,7 +850,7 @@ static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd) log_info("\nDisk stats (read/write):\n"); } - print_disk_util(&du->dus, &du->agg, terse_output); + print_disk_util(&du->dus, &du->agg, output_format == FIO_OUTPUT_TERSE); } static void convert_jobs_eta(struct jobs_eta *je) @@ -816,6 +874,7 @@ static void convert_jobs_eta(struct jobs_eta *je) je->elapsed_sec = le64_to_cpu(je->elapsed_sec); je->eta_sec = le64_to_cpu(je->eta_sec); je->nr_threads = le32_to_cpu(je->nr_threads); + je->is_pow2 = le32_to_cpu(je->is_pow2); } void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) @@ -855,26 +914,50 @@ void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn) static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd) { - struct fio_net_int_cmd *icmd = NULL; + struct fio_net_cmd_reply *reply = NULL; struct flist_head *entry; flist_for_each(entry, &client->cmd_list) { - icmd = flist_entry(entry, struct fio_net_int_cmd, list); + reply = flist_entry(entry, struct fio_net_cmd_reply, list); - if (cmd->tag == (uintptr_t) icmd) + if (cmd->tag == (uintptr_t) reply) break; - icmd = NULL; + reply = NULL; } - if (!icmd) { - log_err("fio: client: unable to find matching tag\n"); + if (!reply) { + log_err("fio: client: unable to find matching tag (%lx)\n", cmd->tag); return; } - flist_del(&icmd->list); - cmd->tag = icmd->saved_tag; - free(icmd); + flist_del(&reply->list); + cmd->tag = reply->saved_tag; + free(reply); +} + +int fio_client_wait_for_reply(struct fio_client *client, uint64_t tag) +{ + do { + struct fio_net_cmd_reply *reply = NULL; + struct flist_head *entry; + + flist_for_each(entry, &client->cmd_list) { + reply = flist_entry(entry, struct fio_net_cmd_reply, list); + + if (tag == (uintptr_t) reply) + break; + + reply = NULL; + } + + if (!reply) + break; + + usleep(1000); + } while (1); + + return 0; } static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd) @@ -912,9 +995,9 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) sprintf(bit, "%d-bit", probe->bpp * 8); - log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n", + log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s\n", probe->hostname, probe->bigendian, bit, os, arch, - probe->fio_major, probe->fio_minor, probe->fio_patch); + probe->fio_version); if (!client->name) client->name = strdup((char *) probe->hostname); @@ -981,6 +1064,7 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) total = nr_samples * sizeof(struct io_sample); ret = malloc(total + sizeof(*pdu)); + ret->thread_number = le32_to_cpu(pdu->thread_number); ret->nr_samples = nr_samples; ret->log_type = le32_to_cpu(pdu->log_type); strcpy((char *) ret->name, (char *) pdu->name); @@ -1000,7 +1084,8 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) stream.avail_out = this_chunk; stream.next_out = p; err = inflate(&stream, Z_NO_FLUSH); - if (err != Z_OK) { + /* may be Z_OK, or Z_STREAM_END */ + if (err < 0) { log_err("fio: inflate error %d\n", err); free(ret); ret = NULL; @@ -1114,16 +1199,23 @@ int fio_handle_client(struct fio_client *client) convert_stop(cmd); client->state = Client_stopped; - client->error = pdu->error; + client->error = le32_to_cpu(pdu->error); + client->signal = le32_to_cpu(pdu->signal); ops->stop(client, cmd); free(cmd); break; } - case FIO_NET_CMD_ADD_JOB: + case FIO_NET_CMD_ADD_JOB: { + struct cmd_add_job_pdu *pdu = (struct cmd_add_job_pdu *) cmd->payload; + + client->thread_number = le32_to_cpu(pdu->thread_number); + client->groupid = le32_to_cpu(pdu->groupid); + if (ops->add_job) ops->add_job(client, cmd); free(cmd); break; + } case FIO_NET_CMD_IOLOG: if (ops->iolog) { struct cmd_iolog_pdu *pdu; @@ -1133,6 +1225,11 @@ int fio_handle_client(struct fio_client *client) } free(cmd); break; + case FIO_NET_CMD_UPDATE_JOB: + ops->update_job(client, cmd); + remove_reply_cmd(client, cmd); + free(cmd); + break; default: log_err("fio: unknown client op: %s\n", fio_server_op(cmd->opcode)); free(cmd); @@ -1181,20 +1278,20 @@ static void request_client_etas(struct client_ops *ops) static int client_check_cmd_timeout(struct fio_client *client, struct timeval *now) { - struct fio_net_int_cmd *cmd; + struct fio_net_cmd_reply *reply; struct flist_head *entry, *tmp; int ret = 0; flist_for_each_safe(entry, tmp, &client->cmd_list) { - cmd = flist_entry(entry, struct fio_net_int_cmd, list); + reply = flist_entry(entry, struct fio_net_cmd_reply, list); - if (mtime_since(&cmd->tv, now) < FIO_NET_CLIENT_TIMEOUT) + if (mtime_since(&reply->tv, now) < FIO_NET_CLIENT_TIMEOUT) continue; log_err("fio: client %s, timeout on cmd %s\n", client->hostname, - fio_server_op(cmd->cmd.opcode)); - flist_del(&cmd->list); - free(cmd); + fio_server_op(reply->opcode)); + flist_del(&reply->list); + free(reply); ret = 1; } @@ -1280,7 +1377,7 @@ int fio_handle_clients(struct client_ops *ops) break; } - ret = poll(pfds, nr_clients, 100); + ret = poll(pfds, nr_clients, ops->eta_msec); if (ret < 0) { if (errno == EINTR) continue;