X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=fe1f32bf57432e6155b3bf9dd5369eb4bcd2b375;hp=7267333d3128017e09d67ef7af8fa23db6a26951;hb=40c605169e60d32fc321a2f9f465e76cba745489;hpb=3650a3ca2ccbfefe7564d6ebde03bf7f89255e89 diff --git a/client.c b/client.c index 7267333d..fe1f32bf 100644 --- a/client.c +++ b/client.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "fio.h" #include "client.h" @@ -26,27 +27,24 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd); static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd); static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd); static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd); +static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd); +static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd); struct client_ops fio_client_ops = { - .text_op = handle_text, + .text = handle_text, .disk_util = handle_du, .thread_status = handle_ts, .group_stats = handle_gs, + .stop = handle_stop, + .start = handle_start, .eta = display_thread_status, .probe = handle_probe, + .eta_msec = FIO_CLIENT_DEF_ETA_MSEC, + .client_type = FIO_CLIENT_TYPE_CLI, }; static struct timeval eta_tv; -enum { - Client_created = 0, - Client_connected = 1, - Client_started = 2, - Client_running = 3, - Client_stopped = 4, - Client_exited = 5, -}; - static FLIST_HEAD(client_list); static FLIST_HEAD(eta_list); @@ -103,15 +101,28 @@ static struct fio_client *find_client_by_fd(int fd) return NULL; } -static void remove_client(struct fio_client *client) +void fio_put_client(struct fio_client *client) { - assert(client->refs); - if (--client->refs) return; + free(client->hostname); + if (client->argv) + free(client->argv); + if (client->name) + free(client->name); + + free(client); +} + +static void remove_client(struct fio_client *client) +{ + assert(client->refs); + dprint(FD_NET, "client: removed <%s>\n", client->hostname); - flist_del(&client->list); + + if (!flist_empty(&client->list)) + flist_del_init(&client->list); fio_client_remove_hash(client); @@ -120,20 +131,22 @@ static void remove_client(struct fio_client *client) fio_client_dec_jobs_eta(client->eta_in_flight, client->ops->eta); } - free(client->hostname); - if (client->argv) - free(client->argv); - if (client->name) - free(client->name); + close(client->fd); + client->fd = -1; + + if (client->ops->removed) + client->ops->removed(client); - free(client); nr_clients--; sum_stat_clients--; + + fio_put_client(client); } -static void put_client(struct fio_client *client) +struct fio_client *fio_get_client(struct fio_client *client) { - remove_client(client); + client->refs++; + return client; } static void __fio_client_add_cmd_option(struct fio_client *client, @@ -201,6 +214,7 @@ struct fio_client *fio_client_add_explicit(struct client_ops *ops, client->fd = -1; client->ops = ops; client->refs = 1; + client->type = ops->client_type; __fio_client_add_cmd_option(client, "fio"); @@ -250,6 +264,7 @@ int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie) client->fd = -1; client->ops = ops; client->refs = 1; + client->type = ops->client_type; __fio_client_add_cmd_option(client, "fio"); @@ -260,6 +275,13 @@ int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie) return 0; } +static void probe_client(struct fio_client *client) +{ + dprint(FD_NET, "client: send probe\n"); + + fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0, &client->cmd_list); +} + static int fio_client_connect_ip(struct fio_client *client) { struct sockaddr *addr; @@ -282,16 +304,20 @@ static int fio_client_connect_ip(struct fio_client *client) fd = socket(domain, SOCK_STREAM, 0); if (fd < 0) { + int ret = -errno; + log_err("fio: socket: %s\n", strerror(errno)); - return -1; + return ret; } if (connect(fd, addr, socklen) < 0) { + int ret = -errno; + log_err("fio: connect: %s\n", strerror(errno)); log_err("fio: failed to connect to %s:%u\n", client->hostname, client->port); close(fd); - return -1; + return ret; } return fd; @@ -309,21 +335,25 @@ static int fio_client_connect_sock(struct fio_client *client) fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd < 0) { + int ret = -errno; + log_err("fio: socket: %s\n", strerror(errno)); - return -1; + return ret; } len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1; if (connect(fd, (struct sockaddr *) addr, len) < 0) { + int ret = -errno; + log_err("fio: connect; %s\n", strerror(errno)); close(fd); - return -1; + return ret; } return fd; } -static int fio_client_connect(struct fio_client *client) +int fio_client_connect(struct fio_client *client) { int fd; @@ -337,14 +367,21 @@ static int fio_client_connect(struct fio_client *client) dprint(FD_NET, "client: %s connected %d\n", client->hostname, fd); if (fd < 0) - return 1; + return fd; client->fd = fd; fio_client_add_hash(client); client->state = Client_connected; + + probe_client(client); return 0; } +int fio_client_terminate(struct fio_client *client) +{ + return fio_net_send_quit(client->fd); +} + void fio_clients_terminate(void) { struct flist_head *entry; @@ -354,8 +391,7 @@ void fio_clients_terminate(void) flist_for_each(entry, &client_list) { client = flist_entry(entry, struct fio_client, list); - - fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_QUIT, 0, NULL); + fio_client_terminate(client); } } @@ -380,13 +416,6 @@ static void client_signal_handler(void) sigaction(SIGTERM, &act, NULL); } -static void probe_client(struct fio_client *client) -{ - dprint(FD_NET, "client: send probe\n"); - - fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0, &client->cmd_list); -} - static int send_client_cmd_line(struct fio_client *client) { struct cmd_single_line_pdu *cslp; @@ -429,7 +458,8 @@ static int send_client_cmd_line(struct fio_client *client) free(lens); clp->lines = cpu_to_le16(client->argc); - ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem, 0); + clp->client_type = __cpu_to_le16(client->type); + ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, mem, NULL, NULL); free(pdu); return ret; } @@ -442,7 +472,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"); @@ -458,8 +488,6 @@ int fio_clients_connect(void) continue; } - probe_client(client); - if (client->argc > 1) send_client_cmd_line(client); } @@ -467,14 +495,44 @@ int fio_clients_connect(void) return !nr_clients; } +int fio_start_client(struct fio_client *client) +{ + dprint(FD_NET, "client: start %s\n", client->hostname); + return fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_RUN, 0, NULL); +} + +int fio_start_all_clients(void) +{ + struct fio_client *client; + struct flist_head *entry, *tmp; + int ret; + + dprint(FD_NET, "client: start all\n"); + + flist_for_each_safe(entry, tmp, &client_list) { + client = flist_entry(entry, struct fio_client, list); + + ret = fio_start_client(client); + if (ret) { + remove_client(client); + continue; + } + } + + return flist_empty(&client_list); +} + /* * Send file contents to server backend. We could use sendfile(), but to remain * more portable lets just read/write the darn thing. */ -static int fio_client_send_ini(struct fio_client *client, const char *filename) +static int __fio_client_send_ini(struct fio_client *client, const char *filename) { + struct cmd_job_pdu *pdu; + size_t p_size; struct stat sb; - char *p, *buf; + char *p; + void *buf; off_t len; int fd, ret; @@ -482,17 +540,23 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename) fd = open(filename, O_RDONLY); if (fd < 0) { + int ret = -errno; + log_err("fio: job file <%s> open: %s\n", filename, strerror(errno)); - return 1; + return ret; } if (fstat(fd, &sb) < 0) { + int ret = -errno; + log_err("fio: job file stat: %s\n", strerror(errno)); close(fd); - return 1; + return ret; } - buf = malloc(sb.st_size); + p_size = sb.st_size + sizeof(*pdu); + pdu = malloc(p_size); + buf = pdu->buf; len = sb.st_size; p = buf; @@ -517,13 +581,27 @@ static int fio_client_send_ini(struct fio_client *client, const char *filename) return 1; } + pdu->buf_len = __cpu_to_le32(sb.st_size); + pdu->client_type = cpu_to_le32(client->type); + client->sent_job = 1; - ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size, 0); - free(buf); + ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, pdu, p_size, NULL, NULL); + free(pdu); close(fd); return ret; } +int fio_client_send_ini(struct fio_client *client, const char *filename) +{ + int ret; + + ret = __fio_client_send_ini(client, filename); + if (!ret) + client->sent_job = 1; + + return ret; +} + int fio_clients_send_ini(const char *filename) { struct fio_client *client; @@ -534,13 +612,23 @@ int fio_clients_send_ini(const char *filename) if (fio_client_send_ini(client, filename)) remove_client(client); - - client->sent_job = 1; } 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); @@ -558,10 +646,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]); @@ -649,6 +738,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) { @@ -745,6 +835,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); } void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) @@ -769,6 +860,9 @@ void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) if (je->eta_sec > dst->eta_sec) dst->eta_sec = je->eta_sec; + + dst->nr_threads += je->nr_threads; + /* we need to handle je->run_str too ... */ } void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn) @@ -781,26 +875,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) @@ -815,6 +933,9 @@ static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd) client->eta_in_flight = NULL; flist_del_init(&client->eta_list); + if (client->ops->jobs_eta) + client->ops->jobs_eta(client, je); + fio_client_sum_jobs_eta(&eta->eta, je); fio_client_dec_jobs_eta(eta, client->ops->eta); } @@ -848,20 +969,22 @@ static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd) struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload; client->state = Client_started; - client->jobs = le32_to_cpu(pdu->jobs); + client->jobs = pdu->jobs; } static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd) { - struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload; - - client->state = Client_stopped; - client->error = le32_to_cpu(pdu->error); - if (client->error) log_info("client <%s>: exited with error %d\n", client->hostname, client->error); } +static void convert_stop(struct fio_net_cmd *cmd) +{ + struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload; + + pdu->error = le32_to_cpu(pdu->error); +} + static void convert_text(struct fio_net_cmd *cmd) { struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmd->payload; @@ -872,6 +995,83 @@ static void convert_text(struct fio_net_cmd *cmd) pdu->log_usec = le64_to_cpu(pdu->log_usec); } +/* + * This has been compressed on the server side, since it can be big. + * Uncompress here. + */ +static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd) +{ + struct cmd_iolog_pdu *pdu = (struct cmd_iolog_pdu *) cmd->payload; + struct cmd_iolog_pdu *ret; + uint32_t nr_samples; + unsigned long total; + z_stream stream; + void *p; + int i; + + stream.zalloc = Z_NULL; + stream.zfree = Z_NULL; + stream.opaque = Z_NULL; + stream.avail_in = 0; + stream.next_in = Z_NULL; + + if (inflateInit(&stream) != Z_OK) + return NULL; + + /* + * Get header first, it's not compressed + */ + nr_samples = le32_to_cpu(pdu->nr_samples); + + 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); + + p = (void *) ret + sizeof(*pdu); + + stream.avail_in = cmd->pdu_len - sizeof(*pdu); + stream.next_in = (void *) pdu + sizeof(*pdu); + while (stream.avail_in) { + unsigned int this_chunk = 65536; + unsigned int this_len; + int err; + + if (this_chunk > total) + this_chunk = total; + + stream.avail_out = this_chunk; + stream.next_out = p; + err = inflate(&stream, Z_NO_FLUSH); + /* may be Z_OK, or Z_STREAM_END */ + if (err < 0) { + log_err("fio: inflate error %d\n", err); + free(ret); + ret = NULL; + goto out; + } + + this_len = this_chunk - stream.avail_out; + p += this_len; + total -= this_len; + } + + for (i = 0; i < ret->nr_samples; i++) { + struct io_sample *s = &ret->samples[i]; + + s->time = le64_to_cpu(s->time); + s->val = le64_to_cpu(s->val); + s->ddir = le32_to_cpu(s->ddir); + s->bs = le32_to_cpu(s->bs); + } + +out: + inflateEnd(&stream); + return ret; +} + int fio_handle_client(struct fio_client *client) { struct client_ops *ops = client->ops; @@ -883,19 +1083,19 @@ int fio_handle_client(struct fio_client *client) if (!cmd) return 0; - dprint(FD_NET, "client: got cmd op %s from %s\n", - fio_server_op(cmd->opcode), client->hostname); + dprint(FD_NET, "client: got cmd op %s from %s (pdu=%u)\n", + fio_server_op(cmd->opcode), client->hostname, cmd->pdu_len); switch (cmd->opcode) { case FIO_NET_CMD_QUIT: if (ops->quit) - ops->quit(client); + ops->quit(client, cmd); remove_client(client); free(cmd); break; case FIO_NET_CMD_TEXT: convert_text(cmd); - ops->text_op(client, cmd); + ops->text(client, cmd); free(cmd); break; case FIO_NET_CMD_DU: { @@ -941,23 +1141,56 @@ int fio_handle_client(struct fio_client *client) ops->probe(client, cmd); free(cmd); break; - case FIO_NET_CMD_RUN: + case FIO_NET_CMD_SERVER_START: client->state = Client_running; + if (ops->job_start) + ops->job_start(client, cmd); free(cmd); break; - case FIO_NET_CMD_START: - handle_start(client, cmd); + case FIO_NET_CMD_START: { + struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload; + + pdu->jobs = le32_to_cpu(pdu->jobs); + ops->start(client, cmd); free(cmd); break; - case FIO_NET_CMD_STOP: - handle_stop(client, cmd); + } + case FIO_NET_CMD_STOP: { + struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload; + + convert_stop(cmd); + client->state = Client_stopped; + 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; + + pdu = convert_iolog(cmd); + ops->iolog(client, pdu); + } + free(cmd); + break; + case FIO_NET_CMD_UPDATE_JOB: + remove_reply_cmd(client, cmd); + ops->update_job(client, cmd); + free(cmd); + break; default: log_err("fio: unknown client op: %s\n", fio_server_op(cmd->opcode)); free(cmd); @@ -1006,20 +1239,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; } @@ -1097,7 +1330,7 @@ int fio_handle_clients(struct client_ops *ops) struct timeval tv; gettimeofday(&tv, NULL); - if (mtime_since(&eta_tv, &tv) >= 900) { + if (mtime_since(&eta_tv, &tv) >= ops->eta_msec) { request_client_etas(ops); memcpy(&eta_tv, &tv, sizeof(tv)); @@ -1105,7 +1338,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; @@ -1131,7 +1364,7 @@ int fio_handle_clients(struct client_ops *ops) retval = 1; } else if (client->error) retval = 1; - put_client(client); + fio_put_client(client); } }