X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=467d093982c8ff1f6fdd2cb7d6781e8c76934c8b;hp=13e84f64b8bfa29e5b0508b0abca2114c02a2646;hb=905e3d4ff8d01a4402186e1ad1f5f1fbbb6b7ef4;hpb=3989b14303458519192f4ace8caf091d587f5e6e diff --git a/client.c b/client.c index 13e84f64..467d0939 100644 --- a/client.c +++ b/client.c @@ -57,6 +57,9 @@ struct group_run_stats client_gs; int sum_stat_clients; 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 @@ -86,6 +89,30 @@ static void fio_init fio_client_hash_init(void) INIT_FLIST_HEAD(&client_hash[i]); } +static void fio_client_json_init(void) +{ + if (output_format != FIO_OUTPUT_JSON) + return; + root = json_create_object(); + json_object_add_value_string(root, "fio version", fio_version_string); + clients_array = json_create_array(); + json_object_add_value_array(root, "client_stats", clients_array); + du_array = json_create_array(); + json_object_add_value_array(root, "disk_util", du_array); +} + +static void fio_client_json_fini(void) +{ + if (output_format != FIO_OUTPUT_JSON) + return; + json_print_object(root); + log_info("\n"); + json_free_object(root); + root = NULL; + clients_array = NULL; + du_array = NULL; +} + static struct fio_client *find_client_by_fd(int fd) { int bucket = hash_long(fd, FIO_CLIENT_HASH_BITS) & FIO_CLIENT_HASH_MASK; @@ -211,7 +238,7 @@ struct fio_client *fio_client_add_explicit(struct client_ops *ops, int ipv6; ipv6 = type == Fio_client_ipv6; - if (fio_server_parse_host(hostname, &ipv6, + if (fio_server_parse_host(hostname, ipv6, &client->addr.sin_addr, &client->addr6.sin6_addr)) goto err; @@ -557,6 +584,8 @@ int fio_start_all_clients(void) dprint(FD_NET, "client: start all\n"); + fio_client_json_init(); + flist_for_each_safe(entry, tmp, &client_list) { client = flist_entry(entry, struct fio_client, list); @@ -625,7 +654,7 @@ static int __fio_client_send_ini(struct fio_client *client, const char *filename if (len) { log_err("fio: failed reading job file %s\n", filename); close(fd); - free(buf); + free(pdu); return 1; } @@ -684,7 +713,7 @@ int fio_client_update_options(struct fio_client *client, 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); } @@ -767,6 +796,11 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) dst->first_error = le32_to_cpu(src->first_error); dst->kb_base = le32_to_cpu(src->kb_base); dst->unit_base = le32_to_cpu(src->unit_base); + + dst->latency_depth = le32_to_cpu(src->latency_depth); + dst->latency_target = le64_to_cpu(src->latency_target); + dst->latency_window = le64_to_cpu(src->latency_window); + dst->latency_percentile.u.f = fio_uint64_to_double(le64_to_cpu(src->latency_percentile.u.i)); } static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) @@ -788,12 +822,24 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) dst->unified_rw_rep = le32_to_cpu(src->unified_rw_rep); } +static void json_object_add_client_info(struct json_object *obj, +struct fio_client *client) +{ + json_object_add_value_string(obj, "hostname", client->hostname); + json_object_add_value_int(obj, "port", client->port); +} + static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) { struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload; + struct json_object *tsobj; - show_thread_status(&p->ts, &p->rs); + tsobj = show_thread_status(&p->ts, &p->rs); client->did_stat = 1; + if (tsobj) { + json_object_add_client_info(tsobj, client); + json_array_add_value_object(clients_array, tsobj); + } if (!do_output_all_clients) return; @@ -808,7 +854,11 @@ static void handle_ts(struct fio_client *client, struct fio_net_cmd *cmd) if (++sum_stat_nr == sum_stat_clients) { strcpy(client_ts.name, "All clients"); - show_thread_status(&client_ts, &client_gs); + tsobj = show_thread_status(&client_ts, &client_gs); + if (tsobj) { + json_object_add_client_info(tsobj, client); + json_array_add_value_object(clients_array, tsobj); + } } } @@ -877,7 +927,13 @@ 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, output_format == FIO_OUTPUT_TERSE); + if (output_format == FIO_OUTPUT_JSON) { + struct json_object *duobj; + json_array_add_disk_util(&du->dus, &du->agg, du_array); + duobj = json_array_last_value_object(du_array); + json_object_add_client_info(duobj, client); + } else + print_disk_util(&du->dus, &du->agg, output_format == FIO_OUTPUT_TERSE); } static void convert_jobs_eta(struct jobs_eta *je) @@ -887,6 +943,7 @@ static void convert_jobs_eta(struct jobs_eta *je) je->nr_running = le32_to_cpu(je->nr_running); je->nr_ramp = le32_to_cpu(je->nr_ramp); je->nr_pending = le32_to_cpu(je->nr_pending); + je->nr_setting_up = le32_to_cpu(je->nr_setting_up); je->files_open = le32_to_cpu(je->files_open); for (i = 0; i < DDIR_RWDIR_CNT; i++) { @@ -912,6 +969,7 @@ void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je) dst->nr_running += je->nr_running; dst->nr_ramp += je->nr_ramp; dst->nr_pending += je->nr_pending; + dst->nr_setting_up += je->nr_setting_up; dst->files_open += je->files_open; for (i = 0; i < DDIR_RWDIR_CNT; i++) { @@ -955,7 +1013,7 @@ static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd) } if (!reply) { - log_err("fio: client: unable to find matching tag (%lx)\n", cmd->tag); + log_err("fio: client: unable to find matching tag (%llx)\n", (unsigned long long) cmd->tag); return; } @@ -1460,7 +1518,7 @@ int fio_handle_clients(struct client_ops *ops) client = find_client_by_fd(pfds[i].fd); if (!client) { - log_err("fio: unknown client fd %d\n", pfds[i].fd); + log_err("fio: unknown client fd %ld\n", (long) pfds[i].fd); continue; } if (!fio_handle_client(client)) { @@ -1474,6 +1532,8 @@ int fio_handle_clients(struct client_ops *ops) } } + fio_client_json_fini(); + free(pfds); return retval; }