X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=5b5d60a3ff61622e5dd2ad6cb1e1f6ee3b3e81dc;hb=28727df79348d4ebbd8fd4b0dd89bbca035f68d0;hp=84f13aa181d5d109dcb3f28f21c571f97684961a;hpb=35c0ba7ff55bbd438cdc171945c61d501a4e693e;p=fio.git diff --git a/client.c b/client.c index 84f13aa1..5b5d60a3 100644 --- a/client.c +++ b/client.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "fio.h" #include "client.h" @@ -39,6 +40,7 @@ struct client_ops fio_client_ops = { .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; @@ -129,6 +131,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--; @@ -206,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"); @@ -255,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"); @@ -367,9 +377,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) @@ -448,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; } @@ -461,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"); @@ -517,8 +528,11 @@ int fio_start_all_clients(void) */ 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; @@ -540,7 +554,9 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename 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; @@ -565,9 +581,12 @@ 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; } @@ -598,6 +617,18 @@ int fio_clients_send_ini(const char *filename) 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); @@ -615,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]); @@ -706,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) { @@ -842,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) @@ -938,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; @@ -1026,16 +1160,37 @@ 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; + + pdu = convert_iolog(cmd); + ops->iolog(client, pdu); + } + 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); @@ -1084,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; } @@ -1183,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;