Merge branch 'master' into gfio

[fio.git] / gclient.c

diff --git a/gclient.c b/gclient.c
index 8675f617fb2d4dfd46d4326c16c5f88e8baf56bd..f317dc70ace1c5f70c39a67962ae57084e411dd9 100644 (file)
--- a/gclient.c
+++ b/gclient.c
@@ -525,7 +525,6 @@ static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
        struct gfio_client *gc = client->client_data;
        struct gui_entry *ge = gc->ge;
        const char *os, *arch;
-       char buf[64];
 
        os = fio_get_os_string(probe->os);
        if (!os)
@@ -546,8 +545,7 @@ static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
        gtk_label_set_text(GTK_LABEL(ge->probe.hostname), (char *) probe->hostname);
        gtk_label_set_text(GTK_LABEL(ge->probe.os), os);
        gtk_label_set_text(GTK_LABEL(ge->probe.arch), arch);
-       sprintf(buf, "%u.%u.%u", probe->fio_major, probe->fio_minor, probe->fio_patch);
-       gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), buf);
+       gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), (char *) probe->fio_version);
 
        gfio_set_state(ge, GE_STATE_CONNECTED);
 
@@ -696,7 +694,7 @@ static void gfio_add_total_depths_tree(GtkListStore *model,
        const int add_mask = 0x17e;
        int i, j;
 
-       stat_calc_dist(ts->io_u_map, ts_total_io_u(ts), io_u_dist);
+       stat_calc_dist(ts->io_u_map, ddir_rw_sum(ts->total_io_u), io_u_dist);
 
        gtk_list_store_append(model, &iter);