X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=client.c;h=40372699b4fbc76a20186abc72e868d77211dcd2;hb=d0db819d9c5abe904f85a3b21a95023fef007f20;hp=ff3983bdf84c37e727ce5b481fe0574fddeff7f5;hpb=084d1c6f817eacaaefa1de4f0637ef6c1405d74b;p=fio.git diff --git a/client.c b/client.c index ff3983bd..40372699 100644 --- a/client.c +++ b/client.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "fio.h" #include "client.h" @@ -22,40 +23,37 @@ #include "hash.h" static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd); -static void handle_ts(struct fio_net_cmd *cmd); -static void handle_gs(struct fio_net_cmd *cmd); -static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd); +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, - .eta = handle_eta, + .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); static FLIST_HEAD(arg_list); -static struct thread_stat client_ts; -static struct group_run_stats client_gs; -static int sum_stat_clients; +struct thread_stat client_ts; +struct group_run_stats client_gs; +int sum_stat_clients; + static int sum_stat_nr; #define FIO_CLIENT_HASH_BITS 7 @@ -94,34 +92,61 @@ static struct fio_client *find_client_by_fd(int fd) flist_for_each(entry, &client_hash[bucket]) { client = flist_entry(entry, struct fio_client, hash_list); - if (client->fd == fd) + if (client->fd == fd) { + client->refs++; return client; + } } return NULL; } +void fio_put_client(struct fio_client *client) +{ + 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); if (!flist_empty(&client->eta_list)) { flist_del_init(&client->eta_list); - fio_client_dec_jobs_eta(client->eta_in_flight, display_thread_status); + 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); +} + +struct fio_client *fio_get_client(struct fio_client *client) +{ + client->refs++; + return client; } static void __fio_client_add_cmd_option(struct fio_client *client, @@ -155,7 +180,8 @@ void fio_client_add_cmd_option(void *cookie, const char *opt) } } -struct fio_client *fio_client_add_explicit(const char *hostname, int type, +struct fio_client *fio_client_add_explicit(struct client_ops *ops, + const char *hostname, int type, int port) { struct fio_client *client; @@ -186,6 +212,9 @@ struct fio_client *fio_client_add_explicit(const char *hostname, int type, } client->fd = -1; + client->ops = ops; + client->refs = 1; + client->type = ops->client_type; __fio_client_add_cmd_option(client, "fio"); @@ -198,7 +227,7 @@ err: return NULL; } -int fio_client_add(const char *hostname, void **cookie) +int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie) { struct fio_client *existing = *cookie; struct fio_client *client; @@ -233,6 +262,9 @@ int fio_client_add(const char *hostname, void **cookie) return -1; client->fd = -1; + client->ops = ops; + client->refs = 1; + client->type = ops->client_type; __fio_client_add_cmd_option(client, "fio"); @@ -243,6 +275,13 @@ int fio_client_add(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; @@ -265,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; @@ -292,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; @@ -320,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; @@ -337,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); } } @@ -363,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; @@ -412,6 +458,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); free(pdu); return ret; @@ -441,8 +488,6 @@ int fio_clients_connect(void) continue; } - probe_client(client); - if (client->argc > 1) send_client_cmd_line(client); } @@ -450,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; @@ -465,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; @@ -500,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, 0); + 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; @@ -517,8 +612,6 @@ 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; @@ -541,10 +634,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]); @@ -619,13 +713,10 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) dst->groupid = le32_to_cpu(src->groupid); } -static void handle_ts(struct fio_net_cmd *cmd) +static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) { struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload; - convert_ts(&p->ts, &p->ts); - convert_gs(&p->rs, &p->rs); - show_thread_status(&p->ts, &p->rs); if (sum_stat_clients == 1) @@ -635,6 +726,7 @@ static void handle_ts(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) { @@ -643,14 +735,29 @@ static void handle_ts(struct fio_net_cmd *cmd) } } -static void handle_gs(struct fio_net_cmd *cmd) +static void handle_gs(struct fio_client *client, struct fio_net_cmd *cmd) { struct group_run_stats *gs = (struct group_run_stats *) cmd->payload; - convert_gs(gs, gs); show_group_stats(gs); } +static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd) +{ + struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmd->payload; + const char *buf = (const char *) pdu->buf; + const char *name; + int fio_unused ret; + + name = client->name ? client->name : client->hostname; + + if (!client->skip_newline) + fprintf(f_out, "<%s> ", name); + ret = fwrite(buf, pdu->buf_len, 1, f_out); + fflush(f_out); + client->skip_newline = strchr(buf, '\n') == NULL; +} + static void convert_agg(struct disk_util_agg *agg) { int i; @@ -684,30 +791,10 @@ static void convert_dus(struct disk_util_stat *dus) dus->msec = le64_to_cpu(dus->msec); } -static void handle_text(struct fio_client *client, struct fio_net_cmd *cmd) -{ - struct cmd_text_pdu *pdu = (struct cmd_text_pdu *) cmd->payload; - const char *buf = (const char *) pdu->buf; - const char *name; - int fio_unused ret; - - name = client->name ? client->name : client->hostname; - - if (!client->skip_newline) - fprintf(f_out, "<%s> ", name); - ret = fwrite(buf, pdu->buf_len, 1, f_out); - fflush(f_out); - client->skip_newline = strchr(buf, '\n') == NULL; -} - - static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd) { struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload; - convert_dus(&du->dus); - convert_agg(&du->agg); - if (!client->disk_stats_shown) { client->disk_stats_shown = 1; log_info("\nDisk stats (read/write):\n"); @@ -716,7 +803,7 @@ static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd) print_disk_util(&du->dus, &du->agg, terse_output); } -void fio_client_convert_jobs_eta(struct jobs_eta *je) +static void convert_jobs_eta(struct jobs_eta *je) { int i; @@ -736,6 +823,7 @@ void fio_client_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) @@ -760,12 +848,15 @@ 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, void (*fn)(struct jobs_eta *)) +void fio_client_dec_jobs_eta(struct client_eta *eta, client_eta_op eta_fn) { if (!--eta->pending) { - fn(&eta->eta); + eta_fn(&eta->eta); free(eta); } } @@ -806,9 +897,11 @@ static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd) client->eta_in_flight = NULL; flist_del_init(&client->eta_list); - fio_client_convert_jobs_eta(je); + 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, display_thread_status); + fio_client_dec_jobs_eta(eta, client->ops->eta); } static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd) @@ -840,20 +933,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; @@ -864,8 +959,86 @@ static void convert_text(struct fio_net_cmd *cmd) pdu->log_usec = le64_to_cpu(pdu->log_usec); } -int fio_handle_client(struct fio_client *client, struct client_ops *ops) +/* + * 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; struct fio_net_cmd *cmd; dprint(FD_NET, "client: handle %s\n", client->hostname); @@ -874,60 +1047,103 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops) 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: + case FIO_NET_CMD_DU: { + struct cmd_du_pdu *du = (struct cmd_du_pdu *) cmd->payload; + + convert_dus(&du->dus); + convert_agg(&du->agg); + ops->disk_util(client, cmd); free(cmd); break; - case FIO_NET_CMD_TS: - ops->thread_status(cmd); + } + case FIO_NET_CMD_TS: { + struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload; + + convert_ts(&p->ts, &p->ts); + convert_gs(&p->rs, &p->rs); + + ops->thread_status(client, cmd); free(cmd); break; - case FIO_NET_CMD_GS: - ops->group_stats(cmd); + } + case FIO_NET_CMD_GS: { + struct group_run_stats *gs = (struct group_run_stats *) cmd->payload; + + convert_gs(gs, gs); + + ops->group_stats(client, cmd); free(cmd); break; - case FIO_NET_CMD_ETA: + } + case FIO_NET_CMD_ETA: { + struct jobs_eta *je = (struct jobs_eta *) cmd->payload; + remove_reply_cmd(client, cmd); - ops->eta(client, cmd); + convert_jobs_eta(je); + handle_eta(client, cmd); free(cmd); break; + } case FIO_NET_CMD_PROBE: remove_reply_cmd(client, cmd); 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: 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; default: log_err("fio: unknown client op: %s\n", fio_server_op(cmd->opcode)); free(cmd); @@ -937,7 +1153,7 @@ int fio_handle_client(struct fio_client *client, struct client_ops *ops) return 1; } -static void request_client_etas(void) +static void request_client_etas(struct client_ops *ops) { struct fio_client *client; struct flist_head *entry; @@ -968,7 +1184,7 @@ static void request_client_etas(void) } while (skipped--) - fio_client_dec_jobs_eta(eta, display_thread_status); + fio_client_dec_jobs_eta(eta, ops->eta); dprint(FD_NET, "client: requested eta tag %p\n", eta); } @@ -996,7 +1212,7 @@ static int client_check_cmd_timeout(struct fio_client *client, return flist_empty(&client->cmd_list) && ret; } -static int fio_client_timed_out(struct client_ops *ops) +static int fio_check_clients_timed_out(void) { struct fio_client *client; struct flist_head *entry, *tmp; @@ -1014,8 +1230,8 @@ static int fio_client_timed_out(struct client_ops *ops) if (!client_check_cmd_timeout(client, &tv)) continue; - if (ops->timed_out) - ops->timed_out(client); + if (client->ops->timed_out) + client->ops->timed_out(client); else log_err("fio: client %s timed out\n", client->hostname); @@ -1047,7 +1263,7 @@ int fio_handle_clients(struct client_ops *ops) flist_for_each_safe(entry, tmp, &client_list) { client = flist_entry(entry, struct fio_client, list); - if (!client->sent_job && !ops->stay_connected && + if (!client->sent_job && !client->ops->stay_connected && flist_empty(&client->cmd_list)) { remove_client(client); continue; @@ -1067,11 +1283,11 @@ int fio_handle_clients(struct client_ops *ops) struct timeval tv; gettimeofday(&tv, NULL); - if (mtime_since(&eta_tv, &tv) >= 900) { - request_client_etas(); + if (mtime_since(&eta_tv, &tv) >= ops->eta_msec) { + request_client_etas(ops); memcpy(&eta_tv, &tv, sizeof(tv)); - if (fio_client_timed_out(ops)) + if (fio_check_clients_timed_out()) break; } @@ -1094,13 +1310,14 @@ int fio_handle_clients(struct client_ops *ops) log_err("fio: unknown client fd %d\n", pfds[i].fd); continue; } - if (!fio_handle_client(client, ops)) { + if (!fio_handle_client(client)) { log_info("client: host=%s disconnected\n", client->hostname); remove_client(client); retval = 1; } else if (client->error) retval = 1; + fio_put_client(client); } }