X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gclient.c;h=928a1b7641da2976c64c9709aaa7314030410a4f;hp=59b0404865a5f477c9cccff128f3855854338964;hb=19192959b8725e5acf15a5fb5246e81934266689;hpb=2b27ad33caede153908e16ffde21384837d4eff5 diff --git a/gclient.c b/gclient.c index 59b04048..928a1b76 100644 --- a/gclient.c +++ b/gclient.c @@ -48,7 +48,7 @@ static GtkActionEntry results_menu_items[] = { { "PrintFile", GTK_STOCK_PRINT, "Print", "P", NULL, G_CALLBACK(results_print) }, { "CloseFile", GTK_STOCK_CLOSE, "Close", "W", NULL, G_CALLBACK(results_close) }, }; -static gint results_nmenu_items = sizeof(results_menu_items) / sizeof(results_menu_items[0]); +static gint results_nmenu_items = ARRAY_SIZE(results_menu_items); static const gchar *results_ui_string = " \ \ @@ -367,6 +367,8 @@ static void gfio_update_client_eta(struct fio_client *client, struct jobs_eta *j if (je->eta_sec != INT_MAX && je->nr_running) { char *iops_str[DDIR_RWDIR_CNT]; char *rate_str[DDIR_RWDIR_CNT]; + char *rate_alt[DDIR_RWDIR_CNT]; + char tmp[128]; int i; if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running) @@ -377,19 +379,26 @@ static void gfio_update_client_eta(struct fio_client *client, struct jobs_eta *j sprintf(output, "%3.1f%% done", perc); } - rate_str[0] = num2str(je->rate[0], 5, 10, i2p, 0); - rate_str[1] = num2str(je->rate[1], 5, 10, i2p, 0); - rate_str[2] = num2str(je->rate[2], 5, 10, i2p, 0); + iops_str[0] = num2str(je->iops[0], 4, 1, 0, N2S_PERSEC); + iops_str[1] = num2str(je->iops[1], 4, 1, 0, N2S_PERSEC); + iops_str[2] = num2str(je->iops[2], 4, 1, 0, N2S_PERSEC); - iops_str[0] = num2str(je->iops[0], 4, 1, 0, 0); - iops_str[1] = num2str(je->iops[1], 4, 1, 0, 0); - iops_str[2] = num2str(je->iops[2], 4, 1, 0, 0); - - gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), rate_str[0]); + rate_str[0] = num2str(je->rate[0], 4, 10, i2p, N2S_BYTEPERSEC); + rate_alt[0] = num2str(je->rate[0], 4, 10, !i2p, N2S_BYTEPERSEC); + snprintf(tmp, sizeof(tmp), "%s (%s)", rate_str[0], rate_alt[0]); + gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), tmp); gtk_entry_set_text(GTK_ENTRY(ge->eta.read_iops), iops_str[0]); - gtk_entry_set_text(GTK_ENTRY(ge->eta.write_bw), rate_str[1]); + + rate_str[1] = num2str(je->rate[1], 4, 10, i2p, N2S_BYTEPERSEC); + rate_alt[1] = num2str(je->rate[1], 4, 10, !i2p, N2S_BYTEPERSEC); + snprintf(tmp, sizeof(tmp), "%s (%s)", rate_str[1], rate_alt[1]); + gtk_entry_set_text(GTK_ENTRY(ge->eta.write_bw), tmp); gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), iops_str[1]); - gtk_entry_set_text(GTK_ENTRY(ge->eta.trim_bw), rate_str[2]); + + rate_str[2] = num2str(je->rate[2], 4, 10, i2p, N2S_BYTEPERSEC); + rate_alt[2] = num2str(je->rate[2], 4, 10, !i2p, N2S_BYTEPERSEC); + snprintf(tmp, sizeof(tmp), "%s (%s)", rate_str[2], rate_alt[2]); + gtk_entry_set_text(GTK_ENTRY(ge->eta.trim_bw), tmp); gtk_entry_set_text(GTK_ENTRY(ge->eta.trim_iops), iops_str[2]); graph_add_xy_data(ge->graphs.iops_graph, ge->graphs.read_iops, je->elapsed_sec, je->iops[0], iops_str[0]); @@ -401,6 +410,7 @@ static void gfio_update_client_eta(struct fio_client *client, struct jobs_eta *j for (i = 0; i < DDIR_RWDIR_CNT; i++) { free(rate_str[i]); + free(rate_alt[i]); free(iops_str[i]); } } @@ -440,8 +450,10 @@ static void gfio_update_all_eta(struct jobs_eta *je) entry_set_int_value(ui->eta.jobs, je->nr_running); if (je->eta_sec != INT_MAX && je->nr_running) { - char *iops_str[3]; - char *rate_str[3]; + char *iops_str[DDIR_RWDIR_CNT]; + char *rate_str[DDIR_RWDIR_CNT]; + char *rate_alt[DDIR_RWDIR_CNT]; + char tmp[128]; if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running) strcpy(output, "-.-% done"); @@ -451,19 +463,26 @@ static void gfio_update_all_eta(struct jobs_eta *je) sprintf(output, "%3.1f%% done", perc); } - rate_str[0] = num2str(je->rate[0], 5, 10, i2p, 0); - rate_str[1] = num2str(je->rate[1], 5, 10, i2p, 0); - rate_str[2] = num2str(je->rate[2], 5, 10, i2p, 0); - - iops_str[0] = num2str(je->iops[0], 4, 1, 0, 0); - iops_str[1] = num2str(je->iops[1], 4, 1, 0, 0); - iops_str[2] = num2str(je->iops[2], 4, 1, 0, 0); + iops_str[0] = num2str(je->iops[0], 4, 1, 0, N2S_PERSEC); + iops_str[1] = num2str(je->iops[1], 4, 1, 0, N2S_PERSEC); + iops_str[2] = num2str(je->iops[2], 4, 1, 0, N2S_PERSEC); - gtk_entry_set_text(GTK_ENTRY(ui->eta.read_bw), rate_str[0]); + rate_str[0] = num2str(je->rate[0], 4, 10, i2p, N2S_BYTEPERSEC); + rate_alt[0] = num2str(je->rate[0], 4, 10, !i2p, N2S_BYTEPERSEC); + snprintf(tmp, sizeof(tmp), "%s (%s)", rate_str[0], rate_alt[0]); + gtk_entry_set_text(GTK_ENTRY(ui->eta.read_bw), tmp); gtk_entry_set_text(GTK_ENTRY(ui->eta.read_iops), iops_str[0]); - gtk_entry_set_text(GTK_ENTRY(ui->eta.write_bw), rate_str[1]); + + rate_str[1] = num2str(je->rate[1], 4, 10, i2p, N2S_BYTEPERSEC); + rate_alt[1] = num2str(je->rate[1], 4, 10, !i2p, N2S_BYTEPERSEC); + snprintf(tmp, sizeof(tmp), "%s (%s)", rate_str[1], rate_alt[1]); + gtk_entry_set_text(GTK_ENTRY(ui->eta.write_bw), tmp); gtk_entry_set_text(GTK_ENTRY(ui->eta.write_iops), iops_str[1]); - gtk_entry_set_text(GTK_ENTRY(ui->eta.trim_bw), rate_str[2]); + + rate_str[2] = num2str(je->rate[2], 4, 10, i2p, N2S_BYTEPERSEC); + rate_alt[2] = num2str(je->rate[2], 4, 10, !i2p, N2S_BYTEPERSEC); + snprintf(tmp, sizeof(tmp), "%s (%s)", rate_str[2], rate_alt[2]); + gtk_entry_set_text(GTK_ENTRY(ui->eta.trim_bw), tmp); gtk_entry_set_text(GTK_ENTRY(ui->eta.trim_iops), iops_str[2]); graph_add_xy_data(ui->graphs.iops_graph, ui->graphs.read_iops, je->elapsed_sec, je->iops[0], iops_str[0]); @@ -475,6 +494,7 @@ static void gfio_update_all_eta(struct jobs_eta *je) for (i = 0; i < DDIR_RWDIR_CNT; i++) { free(rate_str[i]); + free(rate_alt[i]); free(iops_str[i]); } } @@ -552,6 +572,7 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) struct thread_options *o; char *c1, *c2, *c3, *c4; char tmp[80]; + int i2p; p->thread_number = le32_to_cpu(p->thread_number); p->groupid = le32_to_cpu(p->groupid); @@ -565,11 +586,13 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) sprintf(tmp, "%s %s", o->odirect ? "direct" : "buffered", ddir_str(o->td_ddir)); multitext_add_entry(&ge->eta.iotype, tmp); - c1 = fio_uint_to_kmg(o->min_bs[DDIR_READ]); - c2 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]); - c3 = fio_uint_to_kmg(o->min_bs[DDIR_READ]); - c4 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]); - sprintf(tmp, "%s-%s/%s-%s", c1, c2, c3, c4); + i2p = is_power_of_2(o->kb_base); + c1 = num2str(o->min_bs[DDIR_READ], 4, 1, i2p, N2S_BYTE); + c2 = num2str(o->max_bs[DDIR_READ], 4, 1, i2p, N2S_BYTE); + c3 = num2str(o->min_bs[DDIR_WRITE], 4, 1, i2p, N2S_BYTE); + c4 = num2str(o->max_bs[DDIR_WRITE], 4, 1, i2p, N2S_BYTE); + + sprintf(tmp, "%s-%s,%s-%s", c1, c2, c3, c4); free(c1); free(c2); free(c3); @@ -971,8 +994,8 @@ static void gfio_show_lat(GtkWidget *vbox, const char *name, unsigned long min, if (usec_to_msec(&min, &max, &mean, &dev)) base = "(msec)"; - minp = num2str(min, 6, 1, 0, 0); - maxp = num2str(max, 6, 1, 0, 0); + minp = num2str(min, 6, 1, 0, N2S_NONE); + maxp = num2str(max, 6, 1, 0, N2S_NONE); sprintf(tmp, "%s %s", name, base); frame = gtk_frame_new(tmp); @@ -1133,7 +1156,8 @@ static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox, unsigned long long bw, iops; unsigned int flags = 0; double mean[3], dev[3]; - char *io_p, *bw_p, *iops_p; + char *io_p, *io_palt, *bw_p, *bw_palt, *iops_p; + char tmp[128]; int i2p; if (!ts->runtime[ddir]) @@ -1143,11 +1167,9 @@ static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox, runt = ts->runtime[ddir]; bw = (1000 * ts->io_bytes[ddir]) / runt; - io_p = num2str(ts->io_bytes[ddir], 6, 1, i2p, 8); - bw_p = num2str(bw, 6, 1, i2p, ts->unit_base); iops = (1000 * (uint64_t)ts->total_io_u[ddir]) / runt; - iops_p = num2str(iops, 6, 1, 0, 0); + iops_p = num2str(iops, 4, 1, 0, N2S_PERSEC); box = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(mbox), box, TRUE, FALSE, 3); @@ -1162,9 +1184,17 @@ static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox, gtk_box_pack_start(GTK_BOX(main_vbox), box, TRUE, FALSE, 3); label = new_info_label_in_frame(box, "IO"); - gtk_label_set_text(GTK_LABEL(label), io_p); + io_p = num2str(ts->io_bytes[ddir], 4, 1, i2p, N2S_BYTE); + io_palt = num2str(ts->io_bytes[ddir], 4, 1, !i2p, N2S_BYTE); + snprintf(tmp, sizeof(tmp), "%s (%s)", io_p, io_palt); + gtk_label_set_text(GTK_LABEL(label), tmp); + label = new_info_label_in_frame(box, "Bandwidth"); - gtk_label_set_text(GTK_LABEL(label), bw_p); + bw_p = num2str(bw, 4, 1, i2p, ts->unit_base); + bw_palt = num2str(bw, 4, 1, !i2p, ts->unit_base); + snprintf(tmp, sizeof(tmp), "%s (%s)", bw_p, bw_palt); + gtk_label_set_text(GTK_LABEL(label), tmp); + label = new_info_label_in_frame(box, "IOPS"); gtk_label_set_text(GTK_LABEL(label), iops_p); label = new_info_label_in_frame(box, "Runtime (msec)"); @@ -1172,7 +1202,7 @@ static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox, if (calc_lat(&ts->bw_stat[ddir], &min[0], &max[0], &mean[0], &dev[0])) { double p_of_agg = 100.0; - const char *bw_str = "KB"; + const char *bw_str = "KiB/s"; char tmp[32]; if (rs->agg[ddir]) { @@ -1181,14 +1211,21 @@ static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox, p_of_agg = 100.0; } - if (mean[0] > 999999.9) { - min[0] /= 1000.0; - max[0] /= 1000.0; - mean[0] /= 1000.0; - dev[0] /= 1000.0; - bw_str = "MB"; + if (mean[0] > 1073741824.9) { + min[0] /= 1048576.0; + max[0] /= 1048576.0; + mean[0] /= 1048576.0; + dev[0] /= 1048576.0; + bw_str = "GiB/s"; } + if (mean[0] > 1047575.9) { + min[0] /= 1024.0; + max[0] /= 1024.0; + mean[0] /= 1024.0; + dev[0] /= 1024.0; + bw_str = "MiB/s"; + } sprintf(tmp, "Bandwidth (%s)", bw_str); frame = gtk_frame_new(tmp); gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 5); @@ -1238,6 +1275,8 @@ static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox, free(io_p); free(bw_p); + free(io_palt); + free(bw_palt); free(iops_p); }