X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=7fdae2babad7b6f9894b59852a3350aff3c0a5a1;hp=1f52734370527f6ff0bfcf595234fa0a9b282609;hb=9899aff3e34586d7024a360aafdd950e23610adc;hpb=b26317c97b8bcca7cc9144ea6e1d4ed753f2311a diff --git a/client.c b/client.c index 1f527343..7fdae2ba 100644 --- a/client.c +++ b/client.c @@ -60,7 +60,6 @@ static int sum_stat_nr; static struct json_object *root = NULL; static struct json_array *clients_array = NULL; static struct json_array *du_array = NULL; -static int do_output_all_clients; #define FIO_CLIENT_HASH_BITS 7 #define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS) @@ -141,13 +140,16 @@ 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); + while (client->nr_files) { + struct client_file *cf = &client->files[--client->nr_files]; + + free(cf->file); + } + if (client->files) + free(client->files); if (!client->did_stat) - sum_stat_clients -= client->nr_stat; + sum_stat_clients--; free(client); } @@ -262,17 +264,26 @@ err: return NULL; } -void fio_client_add_ini_file(void *cookie, const char *ini_file) +int fio_client_add_ini_file(void *cookie, const char *ini_file, int remote) { struct fio_client *client = cookie; + struct client_file *cf; size_t new_size; + void *new_files; 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++; + new_size = (client->nr_files + 1) * sizeof(struct client_file); + new_files = realloc(client->files, new_size); + if (!new_files) + return 1; + + client->files = new_files; + cf = &client->files[client->nr_files]; + cf->file = strdup(ini_file); + cf->remote = remote; + client->nr_files++; + return 0; } int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie) @@ -599,11 +610,34 @@ int fio_start_all_clients(void) return flist_empty(&client_list); } +static int __fio_client_send_remote_ini(struct fio_client *client, + const char *filename) +{ + struct cmd_load_file_pdu *pdu; + size_t p_size; + int ret; + + dprint(FD_NET, "send remote ini %s to %s\n", filename, client->hostname); + + p_size = sizeof(*pdu) + strlen(filename) + 1; + pdu = malloc(p_size); + memset(pdu, 0, p_size); + pdu->name_len = strlen(filename); + strcpy((char *) pdu->file, filename); + pdu->client_type = cpu_to_le16((uint16_t) client->type); + + client->sent_job = 1; + ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_LOAD_FILE, pdu, p_size,NULL, NULL); + free(pdu); + return ret; +} + /* * 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_local_ini(struct fio_client *client, + const char *filename) { struct cmd_job_pdu *pdu; size_t p_size; @@ -668,17 +702,28 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename return ret; } -int fio_client_send_ini(struct fio_client *client, const char *filename) +int fio_client_send_ini(struct fio_client *client, const char *filename, + int remote) { int ret; - ret = __fio_client_send_ini(client, filename); + if (!remote) + ret = __fio_client_send_local_ini(client, filename); + else + ret = __fio_client_send_remote_ini(client, filename); + if (!ret) client->sent_job = 1; return ret; } +static int fio_client_send_cf(struct fio_client *client, + struct client_file *cf) +{ + return fio_client_send_ini(client, cf->file, cf->remote); +} + int fio_clients_send_ini(const char *filename) { struct fio_client *client; @@ -687,18 +732,23 @@ 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 (client->nr_ini_file) { + if (client->nr_files) { int i; - for (i = 0; i < client->nr_ini_file; i++) { - const char *ini = client->ini_file[i]; + for (i = 0; i < client->nr_files; i++) { + struct client_file *cf; + + cf = &client->files[i]; - if (fio_client_send_ini(client, ini)) { + if (fio_client_send_cf(client, cf)) { remove_client(client); break; } } - } else if (!filename || fio_client_send_ini(client, filename)) + } + if (client->sent_job) + continue; + if (!filename || fio_client_send_ini(client, filename, 0)) remove_client(client); } @@ -780,6 +830,7 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) for (i = 0; i < DDIR_RWDIR_CNT; i++) { dst->total_io_u[i] = le64_to_cpu(src->total_io_u[i]); dst->short_io_u[i] = le64_to_cpu(src->short_io_u[i]); + dst->drop_io_u[i] = le64_to_cpu(src->drop_io_u[i]); } dst->total_submit = le64_to_cpu(src->total_submit); @@ -823,9 +874,11 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) } static void json_object_add_client_info(struct json_object *obj, -struct fio_client *client) + struct fio_client *client) { - json_object_add_value_string(obj, "hostname", client->hostname); + const char *hostname = client->hostname ? client->hostname : ""; + + json_object_add_value_string(obj, "hostname", hostname); json_object_add_value_int(obj, "port", client->port); } @@ -841,7 +894,7 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) json_array_add_value_object(clients_array, tsobj); } - if (!do_output_all_clients) + if (sum_stat_clients <= 1) return; sum_thread_stats(&client_ts, &p->ts, sum_stat_nr); @@ -1101,12 +1154,8 @@ static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd) client->state = Client_started; client->jobs = le32_to_cpu(pdu->jobs); - client->nr_stat = le32_to_cpu(pdu->stat_outputs); - - if (sum_stat_clients > 1) - do_output_all_clients = 1; - sum_stat_clients += client->nr_stat; + sum_stat_clients++; } static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)