#include "gerror.h"
#include "graph.h"
#include "gclient.h"
+#include "printing.h"
static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
struct group_run_stats *rs);
gtk_widget_destroy(ge->results_window);
}
+static void results_print(GtkWidget *w, gpointer *data)
+{
+ struct gui_entry *ge = (struct gui_entry *) data;
+
+ gfio_print_results(ge);
+}
+
static GtkActionEntry results_menu_items[] = {
{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
{ "GraphMenuAction", GTK_STOCK_FILE, "Graph", NULL, NULL, NULL},
+ { "PrintFile", GTK_STOCK_PRINT, "Print", "<Control>P", NULL, G_CALLBACK(results_print) },
{ "CloseFile", GTK_STOCK_CLOSE, "Close", "<Control>W", NULL, G_CALLBACK(results_close) },
};
static gint results_nmenu_items = sizeof(results_menu_items) / sizeof(results_menu_items[0]);
<ui> \
<menubar name=\"MainMenu\"> \
<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
+ <menuitem name=\"Print\" action=\"PrintFile\" /> \
<menuitem name=\"Close\" action=\"CloseFile\" /> \
</menu> \
<menu name=\"GraphMenu\" action=\"GraphMenuAction\"> \
gtk_list_store_append(ui->log_model, &iter);
gtk_list_store_set(ui->log_model, &iter, 0, timebuf, -1);
gtk_list_store_set(ui->log_model, &iter, 1, client->hostname, -1);
- gtk_list_store_set(ui->log_model, &iter, 2, p->level, -1);
+ gtk_list_store_set(ui->log_model, &iter, 2, log_get_level(p->level), -1);
gtk_list_store_set(ui->log_model, &iter, 3, p->buf, -1);
if (p->level == FIO_LOG_ERR)
#endif
if (je->eta_sec != INT_MAX && je->nr_running) {
- char *iops_str[2];
- char *rate_str[2];
+ char *iops_str[DDIR_RWDIR_CNT];
+ char *rate_str[DDIR_RWDIR_CNT];
+ int i;
if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
strcpy(output, "-.-% done");
sprintf(output, "%3.1f%% done", perc);
}
- rate_str[0] = num2str(je->rate[0], 5, 10, i2p);
- rate_str[1] = num2str(je->rate[1], 5, 10, i2p);
+ 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);
- iops_str[1] = num2str(je->iops[1], 4, 1, 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);
gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), rate_str[0]);
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]);
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]);
+ 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]);
graph_add_xy_data(ge->graphs.iops_graph, ge->graphs.write_iops, je->elapsed_sec, je->iops[1], iops_str[1]);
+ graph_add_xy_data(ge->graphs.iops_graph, ge->graphs.trim_iops, je->elapsed_sec, je->iops[2], iops_str[2]);
graph_add_xy_data(ge->graphs.bandwidth_graph, ge->graphs.read_bw, je->elapsed_sec, je->rate[0], rate_str[0]);
graph_add_xy_data(ge->graphs.bandwidth_graph, ge->graphs.write_bw, je->elapsed_sec, je->rate[1], rate_str[1]);
+ graph_add_xy_data(ge->graphs.bandwidth_graph, ge->graphs.trim_bw, je->elapsed_sec, je->rate[2], rate_str[2]);
- free(rate_str[0]);
- free(rate_str[1]);
- free(iops_str[0]);
- free(iops_str[1]);
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+ free(rate_str[i]);
+ free(iops_str[i]);
+ }
}
if (eta_str[0]) {
sprintf(dst, " - %s", eta_str);
}
-
+
gfio_update_thread_status(ge, output, perc);
gdk_threads_leave();
}
char eta_str[128];
char output[256];
double perc = 0.0;
- int i2p = 0;
+ int i, i2p = 0;
gdk_threads_enter();
entry_set_int_value(ui->eta.jobs, je->nr_running);
if (je->eta_sec != INT_MAX && je->nr_running) {
- char *iops_str[2];
- char *rate_str[2];
+ char *iops_str[3];
+ char *rate_str[3];
if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
strcpy(output, "-.-% done");
sprintf(output, "%3.1f%% done", perc);
}
- rate_str[0] = num2str(je->rate[0], 5, 10, i2p);
- rate_str[1] = num2str(je->rate[1], 5, 10, i2p);
+ 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);
- iops_str[1] = num2str(je->iops[1], 4, 1, 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);
gtk_entry_set_text(GTK_ENTRY(ui->eta.read_bw), rate_str[0]);
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]);
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]);
+ 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]);
graph_add_xy_data(ui->graphs.iops_graph, ui->graphs.write_iops, je->elapsed_sec, je->iops[1], iops_str[1]);
+ graph_add_xy_data(ui->graphs.iops_graph, ui->graphs.trim_iops, je->elapsed_sec, je->iops[2], iops_str[2]);
graph_add_xy_data(ui->graphs.bandwidth_graph, ui->graphs.read_bw, je->elapsed_sec, je->rate[0], rate_str[0]);
graph_add_xy_data(ui->graphs.bandwidth_graph, ui->graphs.write_bw, je->elapsed_sec, je->rate[1], rate_str[1]);
+ graph_add_xy_data(ui->graphs.bandwidth_graph, ui->graphs.trim_bw, je->elapsed_sec, je->rate[2], rate_str[2]);
- free(rate_str[0]);
- free(rate_str[1]);
- free(iops_str[0]);
- free(iops_str[1]);
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+ free(rate_str[i]);
+ free(iops_str[i]);
+ }
}
if (eta_str[0]) {
sprintf(dst, " - %s", eta_str);
}
-
+
gfio_update_thread_status_all(ui, output, perc);
gdk_threads_leave();
}
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)
if (!client->name)
client->name = strdup((char *) probe->hostname);
+ gc->client_cpus = le32_to_cpu(probe->cpus);
+ gc->client_flags = le64_to_cpu(probe->flags);
+
gdk_threads_enter();
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);
gdk_threads_leave();
}
+static struct thread_options *gfio_client_add_job(struct gfio_client *gc,
+ struct thread_options_pack *top)
+{
+ struct gfio_client_options *gco;
+
+ gco = calloc(1, sizeof(*gco));
+ convert_thread_options_to_cpu(&gco->o, top);
+ INIT_FLIST_HEAD(&gco->list);
+ flist_add_tail(&gco->list, &gc->o_list);
+ gc->o_list_nr = 1;
+ return &gco->o;
+}
+
static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct cmd_add_job_pdu *p = (struct cmd_add_job_pdu *) cmd->payload;
struct gfio_client *gc = client->client_data;
- struct thread_options *o = &gc->o;
struct gui_entry *ge = gc->ge;
+ struct thread_options *o;
char *c1, *c2, *c3, *c4;
char tmp[80];
p->thread_number = le32_to_cpu(p->thread_number);
p->groupid = le32_to_cpu(p->groupid);
- convert_thread_options_to_cpu(o, &p->top);
+ o = gfio_client_add_job(gc, &p->top);
gdk_threads_enter();
- gtk_combo_box_append_text(GTK_COMBO_BOX(ge->eta.names), (gchar *) o->name);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ge->eta.names), (gchar *) o->name);
gtk_combo_box_set_active(GTK_COMBO_BOX(ge->eta.names), 0);
sprintf(tmp, "%s %s", o->odirect ? "direct" : "buffered", ddir_str(o->td_ddir));
gdk_threads_leave();
}
+static void gfio_update_job_op(struct fio_client *client,
+ struct fio_net_cmd *cmd)
+{
+ uint32_t *pdu_error = (uint32_t *) cmd->payload;
+ struct gfio_client *gc = client->client_data;
+
+ gc->update_job_status = le32_to_cpu(*pdu_error);
+ gc->update_job_done = 1;
+}
+
static void gfio_client_timed_out(struct fio_client *client)
{
struct gfio_client *gc = client->client_data;
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);
gfio_add_sc_depths_tree(model, ts, nr_labels, 1);
gfio_add_sc_depths_tree(model, ts, nr_labels, 0);
- gtk_box_pack_start(GTK_BOX(box), tree_view, TRUE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(box), tree_view, TRUE, TRUE, 3);
}
static void gfio_show_cpu_usage(GtkWidget *vbox, struct thread_stat *ts)
struct graph *g = p;
cairo_t *cr;
- cr = gdk_cairo_create(w->window);
+ cr = gdk_cairo_create(gtk_widget_get_window(w));
#if 0
if (graph_has_tooltips(g)) {
g_object_set(w, "has-tooltip", TRUE, NULL);
static gint on_config_lat_drawing_area(GtkWidget *w, GdkEventConfigure *event,
gpointer data)
{
+ guint width = gtk_widget_get_allocated_width(w);
+ guint height = gtk_widget_get_allocated_height(w);
struct graph *g = data;
- graph_set_size(g, w->allocation.width, w->allocation.height);
- graph_set_size(g, w->allocation.width, w->allocation.height);
+ graph_set_size(g, width, height);
+ graph_set_size(g, width, height);
graph_set_position(g, 0, 0);
return TRUE;
}
*/
if (start == -1U)
return;
-
+
tree_view = gfio_output_lat_buckets(&io_u_lat[start], &ranges[start], end - start + 1);
ge->lat_bucket_graph = setup_lat_bucket_graph("Latency Buckets", &io_u_lat[start], &ranges[start], end - start + 1, 700.0, 300.0);
gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &gfio_color_white);
gtk_container_add(GTK_CONTAINER(completion_vbox), drawing_area);
- g_signal_connect(G_OBJECT(drawing_area), "expose_event", G_CALLBACK(on_expose_lat_drawing_area), ge->lat_bucket_graph);
- g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->lat_bucket_graph);
+ g_signal_connect(G_OBJECT(drawing_area), GFIO_DRAW_EVENT, G_CALLBACK(on_expose_lat_drawing_area), ge->lat_bucket_graph);
+ g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->lat_bucket_graph);
- gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, TRUE, 3);
}
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);
- maxp = num2str(max, 6, 1, 0);
+ minp = num2str(min, 6, 1, 0, 0);
+ maxp = num2str(max, 6, 1, 0, 0);
sprintf(tmp, "%s %s", name, base);
frame = gtk_frame_new(tmp);
gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &gfio_color_white);
gtk_container_add(GTK_CONTAINER(completion_vbox), drawing_area);
- g_signal_connect(G_OBJECT(drawing_area), "expose_event", G_CALLBACK(on_expose_lat_drawing_area), ge->clat_graph);
+ g_signal_connect(G_OBJECT(drawing_area), GFIO_DRAW_EVENT, G_CALLBACK(on_expose_lat_drawing_area), ge->clat_graph);
g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->clat_graph);
- gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, TRUE, 3);
out:
if (ovals)
free(ovals);
struct group_run_stats *rs,
struct thread_stat *ts, int ddir)
{
- const char *ddir_label[2] = { "Read", "Write" };
+ const char *ddir_label[3] = { "Read", "Write", "Trim" };
GtkWidget *frame, *label, *box, *vbox, *main_vbox;
unsigned long min[3], max[3], runt;
unsigned long long bw, iops;
runt = ts->runtime[ddir];
bw = (1000 * ts->io_bytes[ddir]) / runt;
- io_p = num2str(ts->io_bytes[ddir], 6, 1, i2p);
- bw_p = num2str(bw, 6, 1, i2p);
+ 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);
+ iops_p = num2str(iops, 6, 1, 0, 0);
box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(mbox), box, TRUE, FALSE, 3);
frame = gtk_frame_new(ddir_label[ddir]);
- gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 5);
main_vbox = gtk_vbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(frame), main_vbox);
struct group_run_stats *rs)
{
GtkWidget *box, *vbox, *entry, *scroll;
+ int i;
scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_container_set_border_width(GTK_CONTAINER(scroll), 5);
entry = new_info_entry_in_frame(box, "PID");
entry_set_int_value(entry, ts->pid);
- if (ts->io_bytes[DDIR_READ])
- gfio_show_ddir_status(gc, vbox, rs, ts, DDIR_READ);
- if (ts->io_bytes[DDIR_WRITE])
- gfio_show_ddir_status(gc, vbox, rs, ts, DDIR_WRITE);
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+ if (ts->io_bytes[i])
+ gfio_show_ddir_status(gc, vbox, rs, ts, i);
+ }
gfio_show_latency_buckets(gc, vbox, ts);
gfio_show_cpu_usage(vbox, ts);
.probe = gfio_probe_op,
.quit = gfio_quit_op,
.add_job = gfio_add_job_op,
+ .update_job = gfio_update_job_op,
.timed_out = gfio_client_timed_out,
.stop = gfio_client_stop,
.start = gfio_client_start,
projects / fio.git / blobdiff