/*
* gfio - gui front end for fio - the flexible io tester
*
- * Copyright (C) 2012 Stephen M. Cameron <stephenmcameron@gmail.com>
+ * Copyright (C) 2012 Stephen M. Cameron <stephenmcameron@gmail.com>
* Copyright (C) 2012 Jens Axboe <axboe@kernel.dk>
*
* The license below covers all files distributed with fio unless otherwise
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include <locale.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
+#include <libgen.h>
#include <glib.h>
#include <cairo.h>
#include "gfio.h"
#include "ghelpers.h"
#include "goptions.h"
+#include "gerror.h"
+#include "gclient.h"
#include "graph.h"
static int gfio_server_running;
-static const char *gfio_graph_font;
static unsigned int gfio_graph_limit = 100;
-static GdkColor white;
-static void view_log(GtkWidget *w, gpointer data);
+GdkColor gfio_color_white;
+GdkColor gfio_color_lightyellow;
+const char *gfio_graph_font = GRAPH_DEFAULT_FONT;
typedef void (*clickfunction)(GtkWidget *widget, gpointer data);
},
};
-static void gfio_update_thread_status(struct gui_entry *ge, char *status_message, double perc);
-static void gfio_update_thread_status_all(char *status_message, double perc);
-static void report_error(GError *error);
-
-static struct graph *setup_iops_graph(void)
+static void setup_iops_graph(struct gfio_graphs *gg)
{
struct graph *g;
g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font);
graph_title(g, "IOPS (IOs/sec)");
graph_x_title(g, "Time (secs)");
- graph_add_label(g, "Read IOPS");
- graph_add_label(g, "Write IOPS");
- graph_set_color(g, "Read IOPS", 0.13, 0.54, 0.13);
- graph_set_color(g, "Write IOPS", 1.0, 0.0, 0.0);
+ gg->read_iops = graph_add_label(g, "Read IOPS");
+ gg->write_iops = graph_add_label(g, "Write IOPS");
+ gg->trim_iops = graph_add_label(g, "Trim IOPS");
+ graph_set_color(g, gg->read_iops, GFIO_READ_R, GFIO_READ_G, GFIO_READ_B);
+ graph_set_color(g, gg->write_iops, GFIO_WRITE_R, GFIO_WRITE_G, GFIO_WRITE_B);
+ graph_set_color(g, gg->trim_iops, GFIO_TRIM_R, GFIO_TRIM_G, GFIO_TRIM_B);
line_graph_set_data_count_limit(g, gfio_graph_limit);
graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
- return g;
+ graph_set_graph_all_zeroes(g, 0);
+ gg->iops_graph = g;
}
-static struct graph *setup_bandwidth_graph(void)
+static void setup_bandwidth_graph(struct gfio_graphs *gg)
{
struct graph *g;
g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font);
graph_title(g, "Bandwidth (bytes/sec)");
graph_x_title(g, "Time (secs)");
- graph_add_label(g, "Read Bandwidth");
- graph_add_label(g, "Write Bandwidth");
- graph_set_color(g, "Read Bandwidth", 0.13, 0.54, 0.13);
- graph_set_color(g, "Write Bandwidth", 1.0, 0.0, 0.0);
+ gg->read_bw = graph_add_label(g, "Read Bandwidth");
+ gg->write_bw = graph_add_label(g, "Write Bandwidth");
+ gg->trim_bw = graph_add_label(g, "Trim Bandwidth");
+ graph_set_color(g, gg->read_bw, GFIO_READ_R, GFIO_READ_G, GFIO_READ_B);
+ graph_set_color(g, gg->write_bw, GFIO_WRITE_R, GFIO_WRITE_G, GFIO_WRITE_B);
+ graph_set_color(g, gg->trim_bw, GFIO_TRIM_R, GFIO_TRIM_G, GFIO_TRIM_B);
graph_set_base_offset(g, 1);
line_graph_set_data_count_limit(g, 100);
graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
- return g;
+ graph_set_graph_all_zeroes(g, 0);
+ gg->bandwidth_graph = g;
}
static void setup_graphs(struct gfio_graphs *g)
{
- g->iops_graph = setup_iops_graph();
- g->bandwidth_graph = setup_bandwidth_graph();
+ setup_iops_graph(g);
+ setup_bandwidth_graph(g);
}
-static void clear_ge_ui_info(struct gui_entry *ge)
+void clear_ge_ui_info(struct gui_entry *ge)
{
gtk_label_set_text(GTK_LABEL(ge->probe.hostname), "");
gtk_label_set_text(GTK_LABEL(ge->probe.os), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), "");
}
-static void show_info_dialog(struct gui *ui, const char *title,
- const char *message)
-{
- GtkWidget *dialog, *content, *label;
-
- dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(ui->window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-
- content = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- label = gtk_label_new(message);
- gtk_container_add(GTK_CONTAINER(content), label);
- gtk_widget_show_all(dialog);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
-}
-
static void set_menu_entry_text(struct gui *ui, const char *path,
const char *text)
{
const char *connect_str = NULL;
switch (ge->state) {
- default: {
- char tmp[80];
-
- sprintf(tmp, "Bad client state: %u\n", ge->state);
- show_info_dialog(ui, "Error", tmp);
+ default:
+ gfio_report_error(ge, "Bad client state: %u\n", ge->state);
/* fall through to new state */
- }
-
case GE_STATE_NEW:
connect_state = 1;
edit_state = 1;
set_view_results_visible(ui, 0);
}
-static void gfio_set_state(struct gui_entry *ge, unsigned int state)
+void gfio_set_state(struct gui_entry *ge, unsigned int state)
{
ge->state = state;
update_button_states(ge->ui, ge);
}
-static void gfio_ui_setup_log(struct gui *ui)
-{
- GtkTreeSelection *selection;
- GtkListStore *model;
- GtkWidget *tree_view;
-
- model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
-
- tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
- gtk_widget_set_can_focus(tree_view, FALSE);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
- g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
- "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
- tree_view_column(tree_view, 0, "Time", ALIGN_RIGHT | UNSORTABLE);
- tree_view_column(tree_view, 1, "Host", ALIGN_RIGHT | UNSORTABLE);
- tree_view_column(tree_view, 2, "Level", ALIGN_RIGHT | UNSORTABLE);
- tree_view_column(tree_view, 3, "Text", ALIGN_LEFT | UNSORTABLE);
-
- ui->log_model = model;
- ui->log_tree = tree_view;
-}
-
-static struct graph *setup_clat_graph(char *title, unsigned int *ovals,
- fio_fp64_t *plist,
- unsigned int len,
- double xdim, double ydim)
-{
- struct graph *g;
- int i;
-
- g = graph_new(xdim, ydim, gfio_graph_font);
- graph_title(g, title);
- graph_x_title(g, "Percentile");
- graph_y_title(g, "Time");
-
- for (i = 0; i < len; i++) {
- char fbuf[8];
-
- sprintf(fbuf, "%2.2f%%", plist[i].u.f);
- graph_add_label(g, fbuf);
- graph_add_data(g, fbuf, (double) ovals[i]);
- }
-
- return g;
-}
-
-static GtkWidget *gfio_output_clat_percentiles(unsigned int *ovals,
- fio_fp64_t *plist,
- unsigned int len,
- const char *base,
- unsigned int scale)
-{
- GType types[FIO_IO_U_LIST_MAX_LEN];
- GtkWidget *tree_view;
- GtkTreeSelection *selection;
- GtkListStore *model;
- GtkTreeIter iter;
- int i;
-
- for (i = 0; i < len; i++)
- types[i] = G_TYPE_INT;
-
- model = gtk_list_store_newv(len, types);
-
- tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
- gtk_widget_set_can_focus(tree_view, FALSE);
-
- g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
- "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-
- for (i = 0; i < len; i++) {
- char fbuf[8];
-
- sprintf(fbuf, "%2.2f%%", plist[i].u.f);
- tree_view_column(tree_view, i, fbuf, ALIGN_RIGHT | UNSORTABLE);
- }
-
- gtk_list_store_append(model, &iter);
-
- for (i = 0; i < len; i++) {
- if (scale)
- ovals[i] = (ovals[i] + 999) / 1000;
- gtk_list_store_set(model, &iter, i, ovals[i], -1);
- }
-
- return tree_view;
-}
-
-static int on_expose_lat_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
-{
- struct graph *g = p;
- cairo_t *cr;
-
- cr = gdk_cairo_create(w->window);
-#if 0
- if (graph_has_tooltips(g)) {
- g_object_set(w, "has-tooltip", TRUE, NULL);
- g_signal_connect(w, "query-tooltip", G_CALLBACK(clat_graph_tooltip), g);
- }
-#endif
- cairo_set_source_rgb(cr, 0, 0, 0);
- bar_graph_draw(g, cr);
- cairo_destroy(cr);
-
- return FALSE;
-}
-
-static gint on_config_lat_drawing_area(GtkWidget *w, GdkEventConfigure *event,
- gpointer data)
-{
- 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_position(g, 0, 0);
- return TRUE;
-}
-
-static void gfio_show_clat_percentiles(struct gfio_client *gc,
- GtkWidget *vbox, struct thread_stat *ts,
- int ddir)
-{
- unsigned int *io_u_plat = ts->io_u_plat[ddir];
- unsigned long nr = ts->clat_stat[ddir].samples;
- fio_fp64_t *plist = ts->percentile_list;
- unsigned int *ovals, len, minv, maxv, scale_down;
- const char *base;
- GtkWidget *tree_view, *frame, *hbox, *drawing_area, *completion_vbox;
- struct gui_entry *ge = gc->ge;
- char tmp[64];
-
- len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
- if (!len)
- goto out;
-
- /*
- * We default to usecs, but if the value range is such that we
- * should scale down to msecs, do that.
- */
- if (minv > 2000 && maxv > 99999) {
- scale_down = 1;
- base = "msec";
- } else {
- scale_down = 0;
- base = "usec";
- }
-
- sprintf(tmp, "Completion percentiles (%s)", base);
- tree_view = gfio_output_clat_percentiles(ovals, plist, len, base, scale_down);
- ge->clat_graph = setup_clat_graph(tmp, ovals, plist, len, 700.0, 300.0);
-
- frame = gtk_frame_new(tmp);
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
- completion_vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), completion_vbox);
- hbox = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(completion_vbox), hbox);
- drawing_area = gtk_drawing_area_new();
- gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
- gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &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), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->clat_graph);
-
- gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
-out:
- if (ovals)
- free(ovals);
-}
-
-static void gfio_show_lat(GtkWidget *vbox, const char *name, unsigned long min,
- unsigned long max, double mean, double dev)
-{
- const char *base = "(usec)";
- GtkWidget *hbox, *label, *frame;
- char *minp, *maxp;
- char tmp[64];
-
- if (!usec_to_msec(&min, &max, &mean, &dev))
- base = "(msec)";
-
- minp = num2str(min, 6, 1, 0);
- maxp = num2str(max, 6, 1, 0);
-
- sprintf(tmp, "%s %s", name, base);
- frame = gtk_frame_new(tmp);
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
- hbox = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), hbox);
-
- label = new_info_label_in_frame(hbox, "Minimum");
- gtk_label_set_text(GTK_LABEL(label), minp);
- label = new_info_label_in_frame(hbox, "Maximum");
- gtk_label_set_text(GTK_LABEL(label), maxp);
- label = new_info_label_in_frame(hbox, "Average");
- sprintf(tmp, "%5.02f", mean);
- gtk_label_set_text(GTK_LABEL(label), tmp);
- label = new_info_label_in_frame(hbox, "Standard deviation");
- sprintf(tmp, "%5.02f", dev);
- gtk_label_set_text(GTK_LABEL(label), tmp);
-
- free(minp);
- free(maxp);
-
-}
-
-#define GFIO_CLAT 1
-#define GFIO_SLAT 2
-#define GFIO_LAT 4
-
-static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox,
- struct group_run_stats *rs,
- struct thread_stat *ts, int ddir)
-{
- const char *ddir_label[2] = { "Read", "Write" };
- GtkWidget *frame, *label, *box, *vbox, *main_vbox;
- unsigned long min[3], max[3], runt;
- unsigned long long bw, iops;
- unsigned int flags = 0;
- double mean[3], dev[3];
- char *io_p, *bw_p, *iops_p;
- int i2p;
-
- if (!ts->runtime[ddir])
- return;
-
- i2p = is_power_of_2(rs->kb_base);
- 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);
-
- iops = (1000 * (uint64_t)ts->total_io_u[ddir]) / runt;
- iops_p = num2str(iops, 6, 1, 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);
-
- main_vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), main_vbox);
-
- box = gtk_hbox_new(FALSE, 3);
- 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);
- label = new_info_label_in_frame(box, "Bandwidth");
- gtk_label_set_text(GTK_LABEL(label), bw_p);
- 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)");
- label_set_int_value(label, ts->runtime[ddir]);
-
- 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";
- char tmp[32];
-
- if (rs->agg[ddir]) {
- p_of_agg = mean[0] * 100 / (double) rs->agg[ddir];
- if (p_of_agg > 100.0)
- 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";
- }
-
- sprintf(tmp, "Bandwidth (%s)", bw_str);
- frame = gtk_frame_new(tmp);
- gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 5);
-
- box = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), box);
-
- label = new_info_label_in_frame(box, "Minimum");
- label_set_int_value(label, min[0]);
- label = new_info_label_in_frame(box, "Maximum");
- label_set_int_value(label, max[0]);
- label = new_info_label_in_frame(box, "Percentage of jobs");
- sprintf(tmp, "%3.2f%%", p_of_agg);
- gtk_label_set_text(GTK_LABEL(label), tmp);
- label = new_info_label_in_frame(box, "Average");
- sprintf(tmp, "%5.02f", mean[0]);
- gtk_label_set_text(GTK_LABEL(label), tmp);
- label = new_info_label_in_frame(box, "Standard deviation");
- sprintf(tmp, "%5.02f", dev[0]);
- gtk_label_set_text(GTK_LABEL(label), tmp);
- }
-
- if (calc_lat(&ts->slat_stat[ddir], &min[0], &max[0], &mean[0], &dev[0]))
- flags |= GFIO_SLAT;
- if (calc_lat(&ts->clat_stat[ddir], &min[1], &max[1], &mean[1], &dev[1]))
- flags |= GFIO_CLAT;
- if (calc_lat(&ts->lat_stat[ddir], &min[2], &max[2], &mean[2], &dev[2]))
- flags |= GFIO_LAT;
-
- if (flags) {
- frame = gtk_frame_new("Latency");
- gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 5);
-
- vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
-
- if (flags & GFIO_SLAT)
- gfio_show_lat(vbox, "Submission latency", min[0], max[0], mean[0], dev[0]);
- if (flags & GFIO_CLAT)
- gfio_show_lat(vbox, "Completion latency", min[1], max[1], mean[1], dev[1]);
- if (flags & GFIO_LAT)
- gfio_show_lat(vbox, "Total latency", min[2], max[2], mean[2], dev[2]);
- }
-
- if (ts->clat_percentiles)
- gfio_show_clat_percentiles(gc, main_vbox, ts, ddir);
-
- free(io_p);
- free(bw_p);
- free(iops_p);
-}
-
-static struct graph *setup_lat_bucket_graph(const char *title, double *lat,
- const char **labels,
- unsigned int len,
- double xdim, double ydim)
-{
- struct graph *g;
- int i;
-
- g = graph_new(xdim, ydim, gfio_graph_font);
- graph_title(g, title);
- graph_x_title(g, "Buckets");
- graph_y_title(g, "Percent");
-
- for (i = 0; i < len; i++) {
- graph_add_label(g, labels[i]);
- graph_add_data(g, labels[i], lat[i]);
- }
-
- return g;
-}
-
-static GtkWidget *gfio_output_lat_buckets(double *lat, const char **labels,
- int num)
-{
- GtkWidget *tree_view;
- GtkTreeSelection *selection;
- GtkListStore *model;
- GtkTreeIter iter;
- GType *types;
- int i;
-
- types = malloc(num * sizeof(GType));
-
- for (i = 0; i < num; i++)
- types[i] = G_TYPE_STRING;
-
- model = gtk_list_store_newv(num, types);
- free(types);
- types = NULL;
-
- tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
- gtk_widget_set_can_focus(tree_view, FALSE);
-
- g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
- "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-
- for (i = 0; i < num; i++)
- tree_view_column(tree_view, i, labels[i], ALIGN_RIGHT | UNSORTABLE);
-
- gtk_list_store_append(model, &iter);
-
- for (i = 0; i < num; i++) {
- char fbuf[32];
-
- if (lat[i] <= 0.0)
- sprintf(fbuf, "0.00");
- else
- sprintf(fbuf, "%3.2f%%", lat[i]);
-
- gtk_list_store_set(model, &iter, i, fbuf, -1);
- }
-
- return tree_view;
-}
-
-static void gfio_show_latency_buckets(struct gfio_client *gc, GtkWidget *vbox,
- struct thread_stat *ts)
-{
- double io_u_lat[FIO_IO_U_LAT_U_NR + FIO_IO_U_LAT_M_NR];
- const char *ranges[] = { "2u", "4u", "10u", "20u", "50u", "100u",
- "250u", "500u", "750u", "1m", "2m",
- "4m", "10m", "20m", "50m", "100m",
- "250m", "500m", "750m", "1s", "2s", ">= 2s" };
- int start, end, i;
- const int total = FIO_IO_U_LAT_U_NR + FIO_IO_U_LAT_M_NR;
- GtkWidget *frame, *tree_view, *hbox, *completion_vbox, *drawing_area;
- struct gui_entry *ge = gc->ge;
-
- stat_calc_lat_u(ts, io_u_lat);
- stat_calc_lat_m(ts, &io_u_lat[FIO_IO_U_LAT_U_NR]);
-
- /*
- * Found out which first bucket has entries, and which last bucket
- */
- start = end = -1U;
- for (i = 0; i < total; i++) {
- if (io_u_lat[i] == 0.00)
- continue;
-
- if (start == -1U)
- start = i;
- end = i;
- }
-
- /*
- * No entries...
- */
- 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);
-
- frame = gtk_frame_new("Latency buckets");
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
- completion_vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), completion_vbox);
- hbox = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(completion_vbox), hbox);
-
- drawing_area = gtk_drawing_area_new();
- gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
- gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &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);
-
- gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
-}
-
-static void gfio_show_cpu_usage(GtkWidget *vbox, struct thread_stat *ts)
-{
- GtkWidget *box, *frame, *entry;
- double usr_cpu, sys_cpu;
- unsigned long runtime;
- char tmp[32];
-
- runtime = ts->total_run_time;
- if (runtime) {
- double runt = (double) runtime;
-
- usr_cpu = (double) ts->usr_time * 100 / runt;
- sys_cpu = (double) ts->sys_time * 100 / runt;
- } else {
- usr_cpu = 0;
- sys_cpu = 0;
- }
-
- frame = gtk_frame_new("OS resources");
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
- box = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), box);
-
- entry = new_info_entry_in_frame(box, "User CPU");
- sprintf(tmp, "%3.2f%%", usr_cpu);
- gtk_entry_set_text(GTK_ENTRY(entry), tmp);
- entry = new_info_entry_in_frame(box, "System CPU");
- sprintf(tmp, "%3.2f%%", sys_cpu);
- gtk_entry_set_text(GTK_ENTRY(entry), tmp);
- entry = new_info_entry_in_frame(box, "Context switches");
- entry_set_int_value(entry, ts->ctx);
- entry = new_info_entry_in_frame(box, "Major faults");
- entry_set_int_value(entry, ts->majf);
- entry = new_info_entry_in_frame(box, "Minor faults");
- entry_set_int_value(entry, ts->minf);
-}
-static void gfio_add_sc_depths_tree(GtkListStore *model,
- struct thread_stat *ts, unsigned int len,
- int submit)
-{
- double io_u_dist[FIO_IO_U_MAP_NR];
- GtkTreeIter iter;
- /* Bits 0, and 3-8 */
- const int add_mask = 0x1f9;
- int i, j;
-
- if (submit)
- stat_calc_dist(ts->io_u_submit, ts->total_submit, io_u_dist);
- else
- stat_calc_dist(ts->io_u_complete, ts->total_complete, io_u_dist);
-
- gtk_list_store_append(model, &iter);
-
- gtk_list_store_set(model, &iter, 0, submit ? "Submit" : "Complete", -1);
-
- for (i = 1, j = 0; i < len; i++) {
- char fbuf[32];
-
- if (!(add_mask & (1UL << (i - 1))))
- sprintf(fbuf, "0.0%%");
- else {
- sprintf(fbuf, "%3.1f%%", io_u_dist[j]);
- j++;
- }
-
- gtk_list_store_set(model, &iter, i, fbuf, -1);
- }
-
-}
-
-static void gfio_add_total_depths_tree(GtkListStore *model,
- struct thread_stat *ts, unsigned int len)
-{
- double io_u_dist[FIO_IO_U_MAP_NR];
- GtkTreeIter iter;
- /* Bits 1-6, and 8 */
- const int add_mask = 0x17e;
- int i, j;
-
- stat_calc_dist(ts->io_u_map, ts_total_io_u(ts), io_u_dist);
-
- gtk_list_store_append(model, &iter);
-
- gtk_list_store_set(model, &iter, 0, "Total", -1);
-
- for (i = 1, j = 0; i < len; i++) {
- char fbuf[32];
-
- if (!(add_mask & (1UL << (i - 1))))
- sprintf(fbuf, "0.0%%");
- else {
- sprintf(fbuf, "%3.1f%%", io_u_dist[j]);
- j++;
- }
-
- gtk_list_store_set(model, &iter, i, fbuf, -1);
- }
-
-}
-
-static void gfio_show_io_depths(GtkWidget *vbox, struct thread_stat *ts)
-{
- GtkWidget *frame, *box, *tree_view;
- GtkTreeSelection *selection;
- GtkListStore *model;
- GType types[FIO_IO_U_MAP_NR + 1];
- int i;
-#define NR_LABELS 10
- const char *labels[NR_LABELS] = { "Depth", "0", "1", "2", "4", "8", "16", "32", "64", ">= 64" };
-
- frame = gtk_frame_new("IO depths");
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
- box = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), box);
-
- for (i = 0; i < NR_LABELS; i++)
- types[i] = G_TYPE_STRING;
-
- model = gtk_list_store_newv(NR_LABELS, types);
-
- tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
- gtk_widget_set_can_focus(tree_view, FALSE);
-
- g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
- "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-
- for (i = 0; i < NR_LABELS; i++)
- tree_view_column(tree_view, i, labels[i], ALIGN_RIGHT | UNSORTABLE);
-
- gfio_add_total_depths_tree(model, ts, NR_LABELS);
- 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);
-}
-
-static gboolean results_window_delete(GtkWidget *w, gpointer data)
-{
- struct gui_entry *ge = (struct gui_entry *) data;
-
- gtk_widget_destroy(w);
- ge->results_window = NULL;
- ge->results_notebook = NULL;
- return TRUE;
-}
-
-static void results_close(GtkWidget *w, gpointer *data)
-{
- struct gui_entry *ge = (struct gui_entry *) data;
-
- gtk_widget_destroy(ge->results_window);
-}
-
-static GtkActionEntry results_menu_items[] = {
- { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
- { "GraphMenuAction", GTK_STOCK_FILE, "Graph", NULL, NULL, NULL},
- { "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]);
-
-static const gchar *results_ui_string = " \
- <ui> \
- <menubar name=\"MainMenu\"> \
- <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
- <menuitem name=\"Close\" action=\"CloseFile\" /> \
- </menu> \
- <menu name=\"GraphMenu\" action=\"GraphMenuAction\"> \
- </menu>\
- </menubar> \
- </ui> \
-";
-
-static GtkWidget *get_results_menubar(GtkWidget *window, struct gui_entry *ge)
-{
- GtkActionGroup *action_group;
- GtkWidget *widget;
- GError *error = 0;
-
- ge->results_uimanager = gtk_ui_manager_new();
-
- action_group = gtk_action_group_new("ResultsMenu");
- gtk_action_group_add_actions(action_group, results_menu_items, results_nmenu_items, ge);
-
- gtk_ui_manager_insert_action_group(ge->results_uimanager, action_group, 0);
- gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ge->results_uimanager), results_ui_string, -1, &error);
-
- gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ge->results_uimanager));
-
- widget = gtk_ui_manager_get_widget(ge->results_uimanager, "/MainMenu");
- return widget;
-}
-
-static GtkWidget *get_results_window(struct gui_entry *ge)
-{
- GtkWidget *win, *notebook, *vbox;
-
- if (ge->results_window)
- return ge->results_notebook;
-
- win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(win), "Results");
- gtk_window_set_default_size(GTK_WINDOW(win), 1024, 768);
- g_signal_connect(win, "delete-event", G_CALLBACK(results_window_delete), ge);
- g_signal_connect(win, "destroy", G_CALLBACK(results_window_delete), ge);
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(win), vbox);
-
- ge->results_menu = get_results_menubar(win, ge);
- gtk_box_pack_start(GTK_BOX(vbox), ge->results_menu, FALSE, FALSE, 0);
-
- notebook = gtk_notebook_new();
- gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1);
- gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook));
- gtk_container_add(GTK_CONTAINER(vbox), notebook);
-
- ge->results_window = win;
- ge->results_notebook = notebook;
- return ge->results_notebook;
-}
-
-static void disk_util_destroy(GtkWidget *w, gpointer data)
-{
- struct gui_entry *ge = (struct gui_entry *) data;
-
- ge->disk_util_vbox = NULL;
- gtk_widget_destroy(w);
-}
-
-static GtkWidget *get_scrolled_window(gint border_width)
-{
- GtkWidget *scroll;
-
- scroll = gtk_scrolled_window_new(NULL, NULL);
- gtk_container_set_border_width(GTK_CONTAINER(scroll), border_width);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
- return scroll;
-}
-
-static GtkWidget *gfio_disk_util_get_vbox(struct gui_entry *ge)
-{
- GtkWidget *vbox, *box, *scroll, *res_notebook;
-
- if (ge->disk_util_vbox)
- return ge->disk_util_vbox;
-
- scroll = get_scrolled_window(5);
- vbox = gtk_vbox_new(FALSE, 3);
- box = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
-
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox);
- res_notebook = get_results_window(ge);
-
- gtk_notebook_append_page(GTK_NOTEBOOK(res_notebook), scroll, gtk_label_new("Disk utilization"));
- ge->disk_util_vbox = box;
- g_signal_connect(vbox, "destroy", G_CALLBACK(disk_util_destroy), ge);
-
- return ge->disk_util_vbox;
-}
-
-static int __gfio_disk_util_show(GtkWidget *res_notebook,
- struct gfio_client *gc, struct cmd_du_pdu *p)
-{
- GtkWidget *box, *frame, *entry, *vbox, *util_vbox;
- struct gui_entry *ge = gc->ge;
- double util;
- char tmp[16];
-
- util_vbox = gfio_disk_util_get_vbox(ge);
-
- vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(util_vbox), vbox);
-
- frame = gtk_frame_new((char *) p->dus.name);
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2);
-
- box = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), box);
-
- frame = gtk_frame_new("Read");
- gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2);
- vbox = gtk_hbox_new(TRUE, 3);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
- entry = new_info_entry_in_frame(vbox, "IOs");
- entry_set_int_value(entry, p->dus.ios[0]);
- entry = new_info_entry_in_frame(vbox, "Merges");
- entry_set_int_value(entry, p->dus.merges[0]);
- entry = new_info_entry_in_frame(vbox, "Sectors");
- entry_set_int_value(entry, p->dus.sectors[0]);
- entry = new_info_entry_in_frame(vbox, "Ticks");
- entry_set_int_value(entry, p->dus.ticks[0]);
-
- frame = gtk_frame_new("Write");
- gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2);
- vbox = gtk_hbox_new(TRUE, 3);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
- entry = new_info_entry_in_frame(vbox, "IOs");
- entry_set_int_value(entry, p->dus.ios[1]);
- entry = new_info_entry_in_frame(vbox, "Merges");
- entry_set_int_value(entry, p->dus.merges[1]);
- entry = new_info_entry_in_frame(vbox, "Sectors");
- entry_set_int_value(entry, p->dus.sectors[1]);
- entry = new_info_entry_in_frame(vbox, "Ticks");
- entry_set_int_value(entry, p->dus.ticks[1]);
-
- frame = gtk_frame_new("Shared");
- gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2);
- vbox = gtk_hbox_new(TRUE, 3);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
- entry = new_info_entry_in_frame(vbox, "IO ticks");
- entry_set_int_value(entry, p->dus.io_ticks);
- entry = new_info_entry_in_frame(vbox, "Time in queue");
- entry_set_int_value(entry, p->dus.time_in_queue);
-
- util = 0.0;
- if (p->dus.msec)
- util = (double) 100 * p->dus.io_ticks / (double) p->dus.msec;
- if (util > 100.0)
- util = 100.0;
-
- sprintf(tmp, "%3.2f%%", util);
- entry = new_info_entry_in_frame(vbox, "Disk utilization");
- gtk_entry_set_text(GTK_ENTRY(entry), tmp);
-
- gtk_widget_show_all(ge->results_window);
- return 0;
-}
-
-static int gfio_disk_util_show(struct gfio_client *gc)
-{
- struct gui_entry *ge = gc->ge;
- GtkWidget *res_notebook;
- int i;
-
- if (!gc->nr_du)
- return 1;
-
- res_notebook = get_results_window(ge);
-
- for (i = 0; i < gc->nr_du; i++) {
- struct cmd_du_pdu *p = &gc->du[i];
-
- __gfio_disk_util_show(res_notebook, gc, p);
- }
-
- gtk_widget_show_all(ge->results_window);
- return 0;
-}
-
-static void gfio_add_end_results(struct gfio_client *gc, struct thread_stat *ts,
- struct group_run_stats *rs)
-{
- unsigned int nr = gc->nr_results;
-
- gc->results = realloc(gc->results, (nr + 1) * sizeof(struct end_results));
- memcpy(&gc->results[nr].ts, ts, sizeof(*ts));
- memcpy(&gc->results[nr].gs, rs, sizeof(*rs));
- gc->nr_results++;
-}
-
-static void __gfio_display_end_results(GtkWidget *win, struct gfio_client *gc,
- struct thread_stat *ts,
- struct group_run_stats *rs)
-{
- GtkWidget *box, *vbox, *entry, *scroll;
-
- scroll = gtk_scrolled_window_new(NULL, NULL);
- gtk_container_set_border_width(GTK_CONTAINER(scroll), 5);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
- vbox = gtk_vbox_new(FALSE, 3);
-
- box = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), box, TRUE, FALSE, 5);
-
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox);
-
- gtk_notebook_append_page(GTK_NOTEBOOK(win), scroll, gtk_label_new(ts->name));
-
- entry = new_info_entry_in_frame(box, "Name");
- gtk_entry_set_text(GTK_ENTRY(entry), ts->name);
- if (strlen(ts->description)) {
- entry = new_info_entry_in_frame(box, "Description");
- gtk_entry_set_text(GTK_ENTRY(entry), ts->description);
- }
- entry = new_info_entry_in_frame(box, "Group ID");
- entry_set_int_value(entry, ts->groupid);
- entry = new_info_entry_in_frame(box, "Jobs");
- entry_set_int_value(entry, ts->members);
- gc->err_entry = entry = new_info_entry_in_frame(box, "Error");
- entry_set_int_value(entry, ts->error);
- 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);
-
- gfio_show_latency_buckets(gc, vbox, ts);
- gfio_show_cpu_usage(vbox, ts);
- gfio_show_io_depths(vbox, ts);
-}
-
-static void gfio_display_end_results(struct gfio_client *gc)
-{
- struct gui_entry *ge = gc->ge;
- GtkWidget *res_notebook;
- int i;
-
- res_notebook = get_results_window(ge);
-
- for (i = 0; i < gc->nr_results; i++) {
- struct end_results *e = &gc->results[i];
-
- __gfio_display_end_results(res_notebook, gc, &e->ts, &e->gs);
- }
-
- if (gfio_disk_util_show(gc))
- gtk_widget_show_all(ge->results_window);
-}
-
-static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
- struct group_run_stats *rs)
-{
- struct gfio_client *gc = client->client_data;
- struct gui_entry *ge = gc->ge;
-
- gfio_add_end_results(gc, ts, rs);
-
- gdk_threads_enter();
- if (ge->results_window)
- __gfio_display_end_results(ge->results_notebook, gc, ts, rs);
- else
- gfio_display_end_results(gc);
- gdk_threads_leave();
-}
-
-static void gfio_text_op(struct fio_client *client, struct fio_net_cmd *cmd)
-{
- struct cmd_text_pdu *p = (struct cmd_text_pdu *) cmd->payload;
- struct gui *ui = &main_ui;
- GtkTreeIter iter;
- struct tm *tm;
- time_t sec;
- char tmp[64], timebuf[80];
-
- sec = p->log_sec;
- tm = localtime(&sec);
- strftime(tmp, sizeof(tmp), "%Y-%m-%d %H:%M:%S", tm);
- sprintf(timebuf, "%s.%03ld", tmp, p->log_usec / 1000);
-
- gdk_threads_enter();
-
- 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, 3, p->buf, -1);
-
- if (p->level == FIO_LOG_ERR)
- view_log(NULL, (gpointer) ui);
-
- gdk_threads_leave();
-}
-
-static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd)
-{
- struct cmd_du_pdu *p = (struct cmd_du_pdu *) cmd->payload;
- struct gfio_client *gc = client->client_data;
- struct gui_entry *ge = gc->ge;
- unsigned int nr = gc->nr_du;
-
- gc->du = realloc(gc->du, (nr + 1) * sizeof(struct cmd_du_pdu));
- memcpy(&gc->du[nr], p, sizeof(*p));
- gc->nr_du++;
-
- gdk_threads_enter();
- if (ge->results_window)
- __gfio_disk_util_show(ge->results_notebook, gc, p);
- else
- gfio_disk_util_show(gc);
- gdk_threads_leave();
-}
-
-extern int sum_stat_clients;
-extern struct thread_stat client_ts;
-extern struct group_run_stats client_gs;
-
-static int sum_stat_nr;
-
-static void gfio_thread_status_op(struct fio_client *client,
- struct fio_net_cmd *cmd)
-{
- struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
-
- gfio_display_ts(client, &p->ts, &p->rs);
-
- if (sum_stat_clients == 1)
- return;
-
- sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
- sum_group_stats(&client_gs, &p->rs);
-
- client_ts.members++;
- client_ts.thread_number = p->ts.thread_number;
- client_ts.groupid = p->ts.groupid;
-
- if (++sum_stat_nr == sum_stat_clients) {
- strcpy(client_ts.name, "All clients");
- gfio_display_ts(client, &client_ts, &client_gs);
- }
-}
-
-static void gfio_group_stats_op(struct fio_client *client,
- struct fio_net_cmd *cmd)
-{
- /* We're ignoring group stats for now */
-}
-
-static gint on_config_drawing_area(GtkWidget *w, GdkEventConfigure *event,
- gpointer data)
-{
- struct gfio_graphs *g = data;
-
- graph_set_size(g->iops_graph, w->allocation.width / 2.0, w->allocation.height);
- graph_set_position(g->iops_graph, w->allocation.width / 2.0, 0.0);
- graph_set_size(g->bandwidth_graph, w->allocation.width / 2.0, w->allocation.height);
- graph_set_position(g->bandwidth_graph, 0, 0);
- return TRUE;
-}
-
-static void draw_graph(struct graph *g, cairo_t *cr)
-{
- line_graph_draw(g, cr);
- cairo_stroke(cr);
-}
-
-static gboolean graph_tooltip(GtkWidget *w, gint x, gint y,
- gboolean keyboard_mode, GtkTooltip *tooltip,
- gpointer data)
-{
- struct gfio_graphs *g = data;
- const char *text = NULL;
-
- if (graph_contains_xy(g->iops_graph, x, y))
- text = graph_find_tooltip(g->iops_graph, x, y);
- else if (graph_contains_xy(g->bandwidth_graph, x, y))
- text = graph_find_tooltip(g->bandwidth_graph, x, y);
-
- if (text) {
- gtk_tooltip_set_text(tooltip, text);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static int on_expose_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
-{
- struct gfio_graphs *g = p;
- cairo_t *cr;
-
- cr = gdk_cairo_create(w->window);
-
- if (graph_has_tooltips(g->iops_graph) ||
- graph_has_tooltips(g->bandwidth_graph)) {
- g_object_set(w, "has-tooltip", TRUE, NULL);
- g_signal_connect(w, "query-tooltip", G_CALLBACK(graph_tooltip), g);
- }
-
- cairo_set_source_rgb(cr, 0, 0, 0);
- draw_graph(g->iops_graph, cr);
- draw_graph(g->bandwidth_graph, cr);
- cairo_destroy(cr);
-
- return FALSE;
-}
-
-/*
- * Client specific ETA
- */
-static void gfio_update_client_eta(struct fio_client *client, struct jobs_eta *je)
-{
- struct gfio_client *gc = client->client_data;
- struct gui_entry *ge = gc->ge;
- static int eta_good;
- char eta_str[128];
- char output[256];
- char tmp[32];
- double perc = 0.0;
- int i2p = 0;
-
- gdk_threads_enter();
-
- eta_str[0] = '\0';
- output[0] = '\0';
-
- if (je->eta_sec != INT_MAX && je->elapsed_sec) {
- perc = (double) je->elapsed_sec / (double) (je->elapsed_sec + je->eta_sec);
- eta_to_str(eta_str, je->eta_sec);
- }
-
- sprintf(tmp, "%u", je->nr_running);
- gtk_entry_set_text(GTK_ENTRY(ge->eta.jobs), tmp);
- sprintf(tmp, "%u", je->files_open);
- gtk_entry_set_text(GTK_ENTRY(ge->eta.files), tmp);
-
-#if 0
- if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
- if (je->m_rate || je->t_rate) {
- char *tr, *mr;
-
- mr = num2str(je->m_rate, 4, 0, i2p);
- tr = num2str(je->t_rate, 4, 0, i2p);
- gtk_entry_set_text(GTK_ENTRY(ge->eta);
- p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
- free(tr);
- free(mr);
- } else if (je->m_iops || je->t_iops)
- p += sprintf(p, ", CR=%d/%d IOPS", je->t_iops, je->m_iops);
-
- gtk_entry_set_text(GTK_ENTRY(ge->eta.cr_bw), "---");
- gtk_entry_set_text(GTK_ENTRY(ge->eta.cr_iops), "---");
- gtk_entry_set_text(GTK_ENTRY(ge->eta.cw_bw), "---");
- gtk_entry_set_text(GTK_ENTRY(ge->eta.cw_iops), "---");
-#endif
-
- if (je->eta_sec != INT_MAX && je->nr_running) {
- char *iops_str[2];
- char *rate_str[2];
-
- if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
- strcpy(output, "-.-% done");
- else {
- eta_good = 1;
- perc *= 100.0;
- 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);
-
- iops_str[0] = num2str(je->iops[0], 4, 1, 0);
- iops_str[1] = num2str(je->iops[1], 4, 1, 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]);
-
- graph_add_xy_data(ge->graphs.iops_graph, "Read IOPS", je->elapsed_sec, je->iops[0], iops_str[0]);
- graph_add_xy_data(ge->graphs.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1], iops_str[1]);
- graph_add_xy_data(ge->graphs.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0], rate_str[0]);
- graph_add_xy_data(ge->graphs.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[1], rate_str[1]);
-
- free(rate_str[0]);
- free(rate_str[1]);
- free(iops_str[0]);
- free(iops_str[1]);
- }
-
- if (eta_str[0]) {
- char *dst = output + strlen(output);
-
- sprintf(dst, " - %s", eta_str);
- }
-
- gfio_update_thread_status(ge, output, perc);
- gdk_threads_leave();
-}
-
-/*
- * Update ETA in main window for all clients
- */
-static void gfio_update_all_eta(struct jobs_eta *je)
-{
- struct gui *ui = &main_ui;
- static int eta_good;
- char eta_str[128];
- char output[256];
- double perc = 0.0;
- int i2p = 0;
-
- gdk_threads_enter();
-
- eta_str[0] = '\0';
- output[0] = '\0';
-
- if (je->eta_sec != INT_MAX && je->elapsed_sec) {
- perc = (double) je->elapsed_sec / (double) (je->elapsed_sec + je->eta_sec);
- eta_to_str(eta_str, je->eta_sec);
- }
-
-#if 0
- if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
- if (je->m_rate || je->t_rate) {
- char *tr, *mr;
-
- mr = num2str(je->m_rate, 4, 0, i2p);
- tr = num2str(je->t_rate, 4, 0, i2p);
- gtk_entry_set_text(GTK_ENTRY(ui->eta);
- p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
- free(tr);
- free(mr);
- } else if (je->m_iops || je->t_iops)
- p += sprintf(p, ", CR=%d/%d IOPS", je->t_iops, je->m_iops);
-
- gtk_entry_set_text(GTK_ENTRY(ui->eta.cr_bw), "---");
- gtk_entry_set_text(GTK_ENTRY(ui->eta.cr_iops), "---");
- gtk_entry_set_text(GTK_ENTRY(ui->eta.cw_bw), "---");
- gtk_entry_set_text(GTK_ENTRY(ui->eta.cw_iops), "---");
-#endif
-
- 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];
-
- if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
- strcpy(output, "-.-% done");
- else {
- eta_good = 1;
- perc *= 100.0;
- 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);
-
- iops_str[0] = num2str(je->iops[0], 4, 1, 0);
- iops_str[1] = num2str(je->iops[1], 4, 1, 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]);
-
- graph_add_xy_data(ui->graphs.iops_graph, "Read IOPS", je->elapsed_sec, je->iops[0], iops_str[0]);
- graph_add_xy_data(ui->graphs.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1], iops_str[1]);
- graph_add_xy_data(ui->graphs.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0], rate_str[0]);
- graph_add_xy_data(ui->graphs.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[1], rate_str[1]);
-
- free(rate_str[0]);
- free(rate_str[1]);
- free(iops_str[0]);
- free(iops_str[1]);
- }
-
- if (eta_str[0]) {
- char *dst = output + strlen(output);
-
- sprintf(dst, " - %s", eta_str);
- }
-
- gfio_update_thread_status_all(output, perc);
- gdk_threads_leave();
-}
-
-static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
-{
- struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
- 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)
- os = "unknown";
-
- arch = fio_get_arch_string(probe->arch);
- if (!arch)
- os = "unknown";
-
- if (!client->name)
- client->name = strdup((char *) probe->hostname);
-
- 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);
-
- gfio_set_state(ge, GE_STATE_CONNECTED);
-
- gdk_threads_leave();
-}
-
-static void gfio_update_thread_status(struct gui_entry *ge,
- char *status_message, double perc)
-{
- static char message[100];
- const char *m = message;
-
- strncpy(message, status_message, sizeof(message) - 1);
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), m);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), perc / 100.0);
- gtk_widget_queue_draw(main_ui.window);
-}
-
-static void gfio_update_thread_status_all(char *status_message, double perc)
-{
- struct gui *ui = &main_ui;
- static char message[100];
- const char *m = message;
-
- strncpy(message, status_message, sizeof(message) - 1);
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0);
- gtk_widget_queue_draw(ui->window);
-}
-
-static void gfio_quit_op(struct fio_client *client, struct fio_net_cmd *cmd)
-{
- struct gfio_client *gc = client->client_data;
-
- gdk_threads_enter();
- gfio_set_state(gc->ge, GE_STATE_NEW);
- gdk_threads_leave();
-}
-
-static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd)
+static void gfio_ui_setup_log(struct gui *ui)
{
- 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;
- 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);
-
- gdk_threads_enter();
-
- gtk_label_set_text(GTK_LABEL(ge->page_label), (gchar *) o->name);
-
- gtk_combo_box_append_text(GTK_COMBO_BOX(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));
- 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);
- free(c1);
- free(c2);
- free(c3);
- free(c4);
- multitext_add_entry(&ge->eta.bs, tmp);
+ GtkTreeSelection *selection;
+ GtkListStore *model;
+ GtkWidget *tree_view;
- multitext_add_entry(&ge->eta.ioengine, (const char *) o->ioengine);
+ model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
- sprintf(tmp, "%u", o->iodepth);
- multitext_add_entry(&ge->eta.iodepth, tmp);
+ tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ gtk_widget_set_can_focus(tree_view, FALSE);
- multitext_set_entry(&ge->eta.iotype, 0);
- multitext_set_entry(&ge->eta.bs, 0);
- multitext_set_entry(&ge->eta.ioengine, 0);
- multitext_set_entry(&ge->eta.iodepth, 0);
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
+ gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
+ g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
+ "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
- gfio_set_state(ge, GE_STATE_JOB_SENT);
+ tree_view_column(tree_view, 0, "Time", ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, 1, "Host", ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, 2, "Level", ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, 3, "Text", ALIGN_LEFT | UNSORTABLE);
- gdk_threads_leave();
+ ui->log_model = model;
+ ui->log_tree = tree_view;
}
-static void gfio_client_timed_out(struct fio_client *client)
+static gint on_config_drawing_area(GtkWidget *w, GdkEventConfigure *event,
+ gpointer data)
{
- struct gfio_client *gc = client->client_data;
- char buf[256];
-
- gdk_threads_enter();
-
- gfio_set_state(gc->ge, GE_STATE_NEW);
- clear_ge_ui_info(gc->ge);
-
- sprintf(buf, "Client %s: timeout talking to server.\n", client->hostname);
- show_info_dialog(gc->ge->ui, "Network timeout", buf);
+ guint width = gtk_widget_get_allocated_width(w);
+ guint height = gtk_widget_get_allocated_height(w);
+ struct gfio_graphs *g = data;
- gdk_threads_leave();
+ graph_set_size(g->iops_graph, width / 2.0, height);
+ graph_set_position(g->iops_graph, width / 2.0, 0.0);
+ graph_set_size(g->bandwidth_graph, width / 2.0, height);
+ graph_set_position(g->bandwidth_graph, 0, 0);
+ return TRUE;
}
-static void gfio_client_stop(struct fio_client *client, struct fio_net_cmd *cmd)
+static void draw_graph(struct graph *g, cairo_t *cr)
{
- struct gfio_client *gc = client->client_data;
+ line_graph_draw(g, cr);
+ cairo_stroke(cr);
+}
- gdk_threads_enter();
+static gboolean graph_tooltip(GtkWidget *w, gint x, gint y,
+ gboolean keyboard_mode, GtkTooltip *tooltip,
+ gpointer data)
+{
+ struct gfio_graphs *g = data;
+ const char *text = NULL;
- gfio_set_state(gc->ge, GE_STATE_JOB_DONE);
+ if (graph_contains_xy(g->iops_graph, x, y))
+ text = graph_find_tooltip(g->iops_graph, x, y);
+ else if (graph_contains_xy(g->bandwidth_graph, x, y))
+ text = graph_find_tooltip(g->bandwidth_graph, x, y);
- if (gc->err_entry)
- entry_set_int_value(gc->err_entry, client->error);
+ if (text) {
+ gtk_tooltip_set_text(tooltip, text);
+ return TRUE;
+ }
- gdk_threads_leave();
+ return FALSE;
}
-static void gfio_client_start(struct fio_client *client, struct fio_net_cmd *cmd)
+static int on_expose_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
{
- struct gfio_client *gc = client->client_data;
+ struct gfio_graphs *g = p;
+ cairo_t *cr;
- gdk_threads_enter();
- gfio_set_state(gc->ge, GE_STATE_JOB_STARTED);
- gdk_threads_leave();
-}
+ cr = gdk_cairo_create(gtk_widget_get_window(w));
-static void gfio_client_job_start(struct fio_client *client, struct fio_net_cmd *cmd)
-{
- struct gfio_client *gc = client->client_data;
+ if (graph_has_tooltips(g->iops_graph) ||
+ graph_has_tooltips(g->bandwidth_graph)) {
+ g_object_set(w, "has-tooltip", TRUE, NULL);
+ g_signal_connect(w, "query-tooltip", G_CALLBACK(graph_tooltip), g);
+ }
- gdk_threads_enter();
- gfio_set_state(gc->ge, GE_STATE_JOB_RUNNING);
- gdk_threads_leave();
-}
+ cairo_set_source_rgb(cr, 0, 0, 0);
+ draw_graph(g->iops_graph, cr);
+ draw_graph(g->bandwidth_graph, cr);
+ cairo_destroy(cr);
-static void gfio_client_iolog(struct fio_client *client, struct cmd_iolog_pdu *pdu)
-{
- printf("got iolog: name=%s, type=%u, entries=%u\n", pdu->name, pdu->log_type, pdu->nr_samples);
- free(pdu);
-}
-
-struct client_ops gfio_client_ops = {
- .text = gfio_text_op,
- .disk_util = gfio_disk_util_op,
- .thread_status = gfio_thread_status_op,
- .group_stats = gfio_group_stats_op,
- .jobs_eta = gfio_update_client_eta,
- .eta = gfio_update_all_eta,
- .probe = gfio_probe_op,
- .quit = gfio_quit_op,
- .add_job = gfio_add_job_op,
- .timed_out = gfio_client_timed_out,
- .stop = gfio_client_stop,
- .start = gfio_client_start,
- .job_start = gfio_client_job_start,
- .iolog = gfio_client_iolog,
- .eta_msec = FIO_CLIENT_DEF_ETA_MSEC,
- .stay_connected = 1,
- .client_type = FIO_CLIENT_TYPE_GUI,
-};
+ return FALSE;
+}
/*
* FIXME: need more handling here
{
struct gfio_client *gc = ge->client;
- if (gc && gc->client) {
- if (ge->state >= GE_STATE_CONNECTED)
- fio_client_terminate(gc->client);
+ if (gc) {
+ if (gc->client) {
+ if (ge->state >= GE_STATE_CONNECTED)
+ fio_client_terminate(gc->client);
- fio_put_client(gc->client);
+ fio_put_client(gc->client);
+ }
+ free(gc);
}
- flist_del(&ge->list);
+ g_hash_table_remove(ge->ui->ge_hash, &ge->page_num);
+
+ free(ge->job_file);
+ free(ge->host);
free(ge);
}
static void ge_widget_destroy(GtkWidget *w, gpointer data)
{
+ struct gui_entry *ge = (struct gui_entry *) data;
+
+ ge_destroy(ge);
}
static void gfio_quit(struct gui *ui)
{
- struct gui_entry *ge;
-
- while (!flist_empty(&ui->list)) {
- ge = flist_entry(ui->list.next, struct gui_entry, list);
- ge_destroy(ge);
- }
-
- gtk_main_quit();
+ gtk_main_quit();
}
static void quit_clicked(__attribute__((unused)) GtkWidget *widget,
- __attribute__((unused)) gpointer data)
+ gpointer data)
{
- gfio_quit(&main_ui);
+ struct gui *ui = (struct gui *) data;
+
+ gfio_quit(ui);
}
static void *job_thread(void *arg)
return NULL;
}
-static int send_job_files(struct gui_entry *ge)
+static int send_job_file(struct gui_entry *ge)
{
struct gfio_client *gc = ge->client;
- int i, ret = 0;
+ int ret = 0;
- for (i = 0; i < ge->nr_job_files; i++) {
- ret = fio_client_send_ini(gc->client, ge->job_files[i]);
- if (ret < 0) {
- GError *error;
-
- error = g_error_new(g_quark_from_string("fio"), 1, "Failed to send file %s: %s\n", ge->job_files[i], strerror(-ret));
- report_error(error);
- g_error_free(error);
- break;
- } else if (ret)
- break;
+ /*
+ * Prune old options, we are expecting the return options
+ * when the job file is parsed remotely and returned to us.
+ */
+ while (!flist_empty(&gc->o_list)) {
+ struct gfio_client_options *gco;
- free(ge->job_files[i]);
- ge->job_files[i] = NULL;
- }
- while (i < ge->nr_job_files) {
- free(ge->job_files[i]);
- ge->job_files[i] = NULL;
- i++;
+ gco = flist_first_entry(&gc->o_list, struct gfio_client_options, list);
+ flist_del(&gco->list);
+ free(gco);
}
- free(ge->job_files);
- ge->job_files = NULL;
- ge->nr_job_files = 0;
- return ret;
+ ret = fio_client_send_ini(gc->client, ge->job_file, false);
+ if (!ret)
+ return 0;
+
+ gfio_report_error(ge, "Failed to send file %s: %s\n", ge->job_file, strerror(-ret));
+ return 1;
}
static void *server_thread(void *arg)
{
+ fio_server_create_sk_key();
is_backend = 1;
gfio_server_running = 1;
fio_start_server(NULL);
gfio_server_running = 0;
+ fio_server_destroy_sk_key();
return NULL;
}
-static void gfio_start_server(void)
+static void gfio_start_server(struct gui *ui)
{
- struct gui *ui = &main_ui;
-
if (!gfio_server_running) {
gfio_server_running = 1;
pthread_create(&ui->server_t, NULL, server_thread, NULL);
}
static void start_job_clicked(__attribute__((unused)) GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
struct gui_entry *ge = data;
struct gfio_client *gc = ge->client;
static void file_open(GtkWidget *w, gpointer data);
-static void connect_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_entry *ge = data;
- struct gfio_client *gc = ge->client;
-
- if (ge->state == GE_STATE_NEW) {
- int ret;
-
- if (!ge->nr_job_files)
- file_open(widget, ge->ui);
- if (!ge->nr_job_files)
- return;
-
- gc = ge->client;
-
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), "No jobs running");
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), 0.0);
- ret = fio_client_connect(gc->client);
- if (!ret) {
- if (!ge->ui->handler_running)
- pthread_create(&ge->ui->t, NULL, job_thread, ge->ui);
- gfio_set_state(ge, GE_STATE_CONNECTED);
- } else {
- GError *error;
-
- error = g_error_new(g_quark_from_string("fio"), 1, "Failed to connect to %s: %s\n", ge->client->client->hostname, strerror(-ret));
- report_error(error);
- g_error_free(error);
- }
- } else {
- fio_client_terminate(gc->client);
- gfio_set_state(ge, GE_STATE_NEW);
- clear_ge_ui_info(ge);
- }
-}
-
-static void send_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_entry *ge = data;
-
- if (send_job_files(ge)) {
- GError *error;
-
- error = g_error_new(g_quark_from_string("fio"), 1, "Failed to send one or more job files for client %s", ge->client->client->hostname);
- report_error(error);
- g_error_free(error);
-
- gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], 1);
- }
-}
-
-static void on_info_bar_response(GtkWidget *widget, gint response,
- gpointer data)
-{
- struct gui *ui = &main_ui;
-
- if (response == GTK_RESPONSE_OK) {
- gtk_widget_destroy(widget);
- ui->error_info_bar = NULL;
- }
-}
-
-static void report_error(GError *error)
-{
- struct gui *ui = &main_ui;
-
- if (ui->error_info_bar == NULL) {
- ui->error_info_bar = gtk_info_bar_new_with_buttons(GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- NULL);
- g_signal_connect(ui->error_info_bar, "response", G_CALLBACK(on_info_bar_response), NULL);
- gtk_info_bar_set_message_type(GTK_INFO_BAR(ui->error_info_bar),
- GTK_MESSAGE_ERROR);
-
- ui->error_label = gtk_label_new(error->message);
- GtkWidget *container = gtk_info_bar_get_content_area(GTK_INFO_BAR(ui->error_info_bar));
- gtk_container_add(GTK_CONTAINER(container), ui->error_label);
-
- gtk_box_pack_start(GTK_BOX(ui->vbox), ui->error_info_bar, FALSE, FALSE, 0);
- gtk_widget_show_all(ui->vbox);
- } else {
- char buffer[256];
- snprintf(buffer, sizeof(buffer), "Failed to open file.");
- gtk_label_set(GTK_LABEL(ui->error_label), buffer);
- }
-}
-
struct connection_widgets
{
GtkWidget *hentry;
* or not. Show it if we are a localhost and using network,
* or using a socket.
*/
- ctext = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cw->combo));
+ ctext = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cw->combo));
if (!ctext || !strncmp(ctext, "IPv4", 4) || !strncmp(ctext, "IPv6", 4))
uses_net = 1;
g_free(ctext);
}
}
-static int get_connection_details(char **host, int *port, int *type,
- int *server_start)
+static int get_connection_details(struct gui_entry *ge)
{
GtkWidget *dialog, *box, *vbox, *hbox, *frame, *pentry;
struct connection_widgets cw;
+ struct gui *ui = ge->ui;
char *typeentry;
+ if (ge->host)
+ return 0;
+
dialog = gtk_dialog_new_with_buttons("Connection details",
- GTK_WINDOW(main_ui.window),
+ GTK_WINDOW(ui->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
frame = gtk_frame_new("Hostname / socket name");
- /* gtk_dialog_get_content_area() is 2.14 and newer */
- vbox = GTK_DIALOG(dialog)->vbox;
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
box = gtk_vbox_new(FALSE, 6);
hbox = gtk_hbox_new(TRUE, 4);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
- cw.combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(cw.combo), "IPv4");
- gtk_combo_box_append_text(GTK_COMBO_BOX(cw.combo), "IPv6");
- gtk_combo_box_append_text(GTK_COMBO_BOX(cw.combo), "local socket");
+ cw.combo = gtk_combo_box_text_new();
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cw.combo), "IPv4");
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cw.combo), "IPv6");
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cw.combo), "local socket");
gtk_combo_box_set_active(GTK_COMBO_BOX(cw.combo), 0);
gtk_container_add(GTK_CONTAINER(hbox), cw.combo);
/*
* Connect edit signal, so we can show/not-show the auto start button
*/
- g_signal_connect(GTK_OBJECT(cw.hentry), "changed", G_CALLBACK(hostname_cb), &cw);
- g_signal_connect(GTK_OBJECT(cw.combo), "changed", G_CALLBACK(hostname_cb), &cw);
+ g_signal_connect(G_OBJECT(cw.hentry), "changed", G_CALLBACK(hostname_cb), &cw);
+ g_signal_connect(G_OBJECT(cw.combo), "changed", G_CALLBACK(hostname_cb), &cw);
gtk_widget_show_all(dialog);
return 1;
}
- *host = strdup(gtk_entry_get_text(GTK_ENTRY(cw.hentry)));
- *port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pentry));
+ ge->host = strdup(gtk_entry_get_text(GTK_ENTRY(cw.hentry)));
+ ge->port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pentry));
- typeentry = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cw.combo));
+ typeentry = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(cw.combo));
if (!typeentry || !strncmp(typeentry, "IPv4", 4))
- *type = Fio_client_ipv4;
+ ge->type = Fio_client_ipv4;
else if (!strncmp(typeentry, "IPv6", 4))
- *type = Fio_client_ipv6;
+ ge->type = Fio_client_ipv6;
else
- *type = Fio_client_socket;
+ ge->type = Fio_client_socket;
g_free(typeentry);
- *server_start = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.button));
+ ge->server_start = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.button));
gtk_widget_destroy(dialog);
return 0;
}
+static void gfio_set_client(struct gfio_client *gc, struct fio_client *client)
+{
+ gc->client = fio_get_client(client);
+ client->client_data = gc;
+}
+
static void gfio_client_added(struct gui_entry *ge, struct fio_client *client)
{
+ struct gfio_client_options *gco;
struct gfio_client *gc;
- gc = malloc(sizeof(*gc));
- memset(gc, 0, sizeof(*gc));
- options_default_fill(&gc->o);
+ gc = calloc(1, sizeof(*gc));
+ INIT_FLIST_HEAD(&gc->o_list);
gc->ge = ge;
- gc->client = fio_get_client(client);
-
ge->client = gc;
+ gfio_set_client(gc, client);
- client->client_data = gc;
+ /*
+ * Just add a default set of options, need to consider how best
+ * to handle this
+ */
+ gco = calloc(1, sizeof(*gco));
+ INIT_FLIST_HEAD(&gco->list);
+ options_default_fill(&gco->o);
+ flist_add_tail(&gco->list, &gc->o_list);
+ gc->o_list_nr++;
+}
+
+static void gfio_clear_graph_data(struct gfio_graphs *g)
+{
+ graph_clear_values(g->iops_graph);
+ graph_clear_values(g->bandwidth_graph);
+}
+
+static void connect_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_entry *ge = data;
+ struct gfio_client *gc = ge->client;
+
+ if (ge->state == GE_STATE_NEW) {
+ int ret;
+
+ if (!ge->job_file)
+ file_open(widget, ge->ui);
+ if (!ge->job_file)
+ return;
+
+ gc = ge->client;
+
+ if (!gc->client) {
+ struct fio_client *client;
+
+ if (get_connection_details(ge)) {
+ gfio_report_error(ge, "Failed to get connection details\n");
+ return;
+ }
+
+ client = fio_client_add_explicit(&gfio_client_ops, ge->host, ge->type, ge->port);
+ if (!client) {
+ gfio_report_error(ge, "Failed to add client %s\n", ge->host);
+ free(ge->host);
+ ge->host = NULL;
+ return;
+ }
+ gfio_set_client(gc, client);
+ }
+
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), "No jobs running");
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), 0.0);
+ ret = fio_client_connect(gc->client);
+ if (!ret) {
+ if (!ge->ui->handler_running)
+ pthread_create(&ge->ui->t, NULL, job_thread, ge->ui);
+ gfio_set_state(ge, GE_STATE_CONNECTED);
+ gfio_clear_graph_data(&ge->graphs);
+ } else {
+ gfio_report_error(ge, "Failed to connect to %s: %s\n", ge->client->client->hostname, strerror(-ret));
+ }
+ } else {
+ fio_client_terminate(gc->client);
+ gfio_set_state(ge, GE_STATE_NEW);
+ clear_ge_ui_info(ge);
+ }
+}
+
+static void send_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_entry *ge = data;
+
+ if (send_job_file(ge))
+ gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], 1);
}
static GtkWidget *new_client_page(struct gui_entry *ge);
ge = malloc(sizeof(*ge));
memset(ge, 0, sizeof(*ge));
ge->state = GE_STATE_NEW;
- INIT_FLIST_HEAD(&ge->list);
- flist_add_tail(&ge->list, &ui->list);
ge->ui = ui;
return ge;
}
-static struct gui_entry *get_new_ge_with_tab(const char *name)
+static struct gui_entry *get_new_ge_with_tab(struct gui *ui, const char *name)
{
struct gui_entry *ge;
- ge = alloc_new_gui_entry(&main_ui);
+ ge = alloc_new_gui_entry(ui);
ge->vbox = new_client_page(ge);
g_signal_connect(ge->vbox, "destroy", G_CALLBACK(ge_widget_destroy), ge);
ge->page_label = gtk_label_new(name);
- ge->page_num = gtk_notebook_append_page(GTK_NOTEBOOK(main_ui.notebook), ge->vbox, ge->page_label);
+ ge->page_num = gtk_notebook_append_page(GTK_NOTEBOOK(ui->notebook), ge->vbox, ge->page_label);
- gtk_widget_show_all(main_ui.window);
+ g_hash_table_insert(ui->ge_hash, &ge->page_num, ge);
+
+ gtk_widget_show_all(ui->window);
return ge;
}
struct gui *ui = (struct gui *) data;
struct gui_entry *ge;
- ge = get_new_ge_with_tab("Untitled");
+ ge = get_new_ge_with_tab(ui, "Untitled");
gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
}
* Return the 'ge' corresponding to the tab. If the active tab is the
* main tab, open a new tab.
*/
-static struct gui_entry *get_ge_from_page(gint cur_page, int *created)
+static struct gui_entry *get_ge_from_page(struct gui *ui, gint cur_page,
+ int *created)
{
- struct flist_head *entry;
- struct gui_entry *ge;
-
if (!cur_page) {
if (created)
*created = 1;
- return get_new_ge_with_tab("Untitled");
+ return get_new_ge_with_tab(ui, "Untitled");
}
if (created)
*created = 0;
- flist_for_each(entry, &main_ui.list) {
- ge = flist_entry(entry, struct gui_entry, list);
- if (ge->page_num == cur_page)
- return ge;
- }
-
- return NULL;
+ return g_hash_table_lookup(ui->ge_hash, &cur_page);
}
static struct gui_entry *get_ge_from_cur_tab(struct gui *ui)
*/
cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook));
if (cur_page)
- return get_ge_from_page(cur_page, NULL);
+ return get_ge_from_page(ui, cur_page, NULL);
return NULL;
}
return;
}
- if (!flist_empty(&ui->list)) {
- show_info_dialog(ui, "Error", "The main page view cannot be closed\n");
+ if (g_hash_table_size(ui->ge_hash)) {
+ gfio_report_info(ui, "Error", "The main page view cannot be closed\n");
return;
}
return strdup(uri + 7);
}
-static int do_file_open(struct gui_entry *ge, const gchar *uri, char *host,
- int type, int port)
+static int do_file_open(struct gui_entry *ge, const gchar *uri)
{
struct fio_client *client;
- gchar *filename;
- filename = get_filename_from_uri(uri);
+ assert(!ge->job_file);
- ge->job_files = realloc(ge->job_files, (ge->nr_job_files + 1) * sizeof(char *));
- ge->job_files[ge->nr_job_files] = strdup(filename);
- ge->nr_job_files++;
+ ge->job_file = get_filename_from_uri(uri);
- client = fio_client_add_explicit(&gfio_client_ops, host, type, port);
- if (!client) {
- GError *error;
+ client = fio_client_add_explicit(&gfio_client_ops, ge->host, ge->type, ge->port);
+ if (client) {
+ char *label = strdup(uri);
- error = g_error_new(g_quark_from_string("fio"), 1,
- "Failed to add client %s", host);
- report_error(error);
- g_error_free(error);
- return 1;
+ basename(label);
+ gtk_label_set_text(GTK_LABEL(ge->page_label), basename(label));
+ free(label);
+
+ gfio_client_added(ge, client);
+ file_add_recent(ge->ui, uri);
+ return 0;
}
- gfio_client_added(ge, client);
- file_add_recent(ge->ui, uri);
- return 0;
+ gfio_report_error(ge, "Failed to add client %s\n", ge->host);
+ free(ge->host);
+ ge->host = NULL;
+ free(ge->job_file);
+ ge->job_file = NULL;
+ return 1;
}
static int do_file_open_with_tab(struct gui *ui, const gchar *uri)
{
- int port, type, server_start;
struct gui_entry *ge;
gint cur_page;
- char *host;
int ret, ge_is_new = 0;
/*
* current tab already has a client.
*/
cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook));
- ge = get_ge_from_page(cur_page, &ge_is_new);
+ ge = get_ge_from_page(ui, cur_page, &ge_is_new);
if (ge->client) {
- ge = get_new_ge_with_tab("Untitled");
+ ge = get_new_ge_with_tab(ui, "Untitled");
ge_is_new = 1;
}
gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
- if (get_connection_details(&host, &port, &type, &server_start)) {
+ if (get_connection_details(ge)) {
if (ge_is_new)
gtk_widget_destroy(ge->vbox);
-
+
return 1;
}
- ret = do_file_open(ge, uri, host, type, port);
-
- free(host);
+ ret = do_file_open(ge, uri);
if (!ret) {
- if (server_start)
- gfio_start_server();
+ if (ge->server_start)
+ gfio_start_server(ui);
} else {
if (ge_is_new)
gtk_widget_destroy(ge->vbox);
{
struct gui *ui = data;
GtkWidget *dialog;
- GSList *filenames, *fn_glist;
GtkFileFilter *filter;
+ gchar *filename;
dialog = gtk_file_chooser_dialog_new("Open File",
GTK_WINDOW(ui->window),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "*.fio");
return;
}
- fn_glist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
+ filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
gtk_widget_destroy(dialog);
- filenames = fn_glist;
- while (filenames != NULL) {
- if (do_file_open_with_tab(ui, filenames->data))
- break;
- filenames = g_slist_next(filenames);
- }
-
- g_slist_free(fn_glist);
+ do_file_open_with_tab(ui, filename);
+ g_free(filename);
}
static void file_save(GtkWidget *w, gpointer data)
{
struct gui *ui = (struct gui *) data;
- gtk_widget_ref(ui->log_tree);
+ g_object_ref(G_OBJECT(ui->log_tree));
gtk_container_remove(GTK_CONTAINER(w), ui->log_tree);
gtk_widget_destroy(w);
ui->log_view = NULL;
}
-static void view_log(GtkWidget *w, gpointer data)
+void gfio_view_log(struct gui *ui)
{
GtkWidget *win, *scroll, *vbox, *box;
- struct gui *ui = (struct gui *) data;
if (ui->log_view)
return;
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
box = gtk_hbox_new(TRUE, 0);
- gtk_box_pack_start_defaults(GTK_BOX(box), ui->log_tree);
+ gtk_box_pack_start(GTK_BOX(box), ui->log_tree, TRUE, TRUE, 0);
g_signal_connect(box, "destroy", G_CALLBACK(view_log_destroy), ui);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), box);
vbox = gtk_vbox_new(TRUE, 5);
- gtk_box_pack_start_defaults(GTK_BOX(vbox), scroll);
+ gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(win), vbox);
gtk_widget_show_all(win);
}
+static void view_log(GtkWidget *w, gpointer data)
+{
+ struct gui *ui = (struct gui *) data;
+
+ gfio_view_log(ui);
+}
+
static void connect_job_entry(GtkWidget *w, gpointer data)
{
struct gui *ui = (struct gui *) data;
struct gui_entry *ge;
-
+
ge = get_ge_from_cur_tab(ui);
if (ge)
connect_clicked(w, ge);
ge = get_ge_from_cur_tab(ui);
if (ge)
send_clicked(w, ge);
-
}
static void edit_job_entry(GtkWidget *w, gpointer data)
ge = get_ge_from_cur_tab(ui);
if (ge && ge->client)
- gopt_get_options_window(ui->window, &ge->client->o);
+ gopt_get_options_window(ui->window, ge->client);
}
static void start_job_entry(GtkWidget *w, gpointer data)
gfio_display_end_results(gc);
}
-static void __update_graph_limits(struct gfio_graphs *g)
+static void __update_graph_settings(struct gfio_graphs *g)
{
line_graph_set_data_count_limit(g->iops_graph, gfio_graph_limit);
+ graph_set_font(g->iops_graph, gfio_graph_font);
line_graph_set_data_count_limit(g->bandwidth_graph, gfio_graph_limit);
+ graph_set_font(g->bandwidth_graph, gfio_graph_font);
+}
+
+static void ge_update_settings_fn(gpointer key, gpointer value, gpointer data)
+{
+ struct gui_entry *ge = (struct gui_entry *) value;
+ GdkEvent *ev;
+
+ __update_graph_settings(&ge->graphs);
+
+ ev = gdk_event_new(GDK_EXPOSE);
+ g_signal_emit_by_name(G_OBJECT(ge->graphs.drawing_area), GFIO_DRAW_EVENT, GTK_WIDGET(ge->graphs.drawing_area), ev, &ge->graphs);
+ gdk_event_free(ev);
}
static void update_graph_limits(void)
{
- struct flist_head *entry;
- struct gui_entry *ge;
+ struct gui *ui = &main_ui;
+ GdkEvent *ev;
- __update_graph_limits(&main_ui.graphs);
+ __update_graph_settings(&ui->graphs);
- flist_for_each(entry, &main_ui.list) {
- ge = flist_entry(entry, struct gui_entry, list);
- __update_graph_limits(&ge->graphs);
- }
+ ev = gdk_event_new(GDK_EXPOSE);
+ g_signal_emit_by_name(G_OBJECT(ui->graphs.drawing_area), GFIO_DRAW_EVENT, GTK_WIDGET(ui->graphs.drawing_area), ev, &ui->graphs);
+ gdk_event_free(ev);
+
+ g_hash_table_foreach(ui->ge_hash, ge_update_settings_fn, NULL);
}
static void preferences(GtkWidget *w, gpointer data)
{
GtkWidget *dialog, *frame, *box, **buttons, *vbox, *font;
GtkWidget *hbox, *spin, *entry, *spin_int;
+ struct gui *ui = (struct gui *) data;
int i;
dialog = gtk_dialog_new_with_buttons("Preferences",
- GTK_WINDOW(main_ui.window),
+ GTK_WINDOW(ui->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
frame = gtk_frame_new("Graphing");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(frame), vbox);
entry = gtk_label_new("Font face to use for graph labels");
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 5);
- font = gtk_font_button_new();
+ font = gtk_font_button_new_with_font(gfio_graph_font);
gtk_box_pack_start(GTK_BOX(hbox), font, FALSE, FALSE, 5);
box = gtk_vbox_new(FALSE, 6);
spin_int = create_spinbutton(hbox, 100, 100000, gfio_client_ops.eta_msec);
frame = gtk_frame_new("Debug logging");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(frame), vbox);
{
const char *authors[] = {
"Jens Axboe <axboe@kernel.dk>",
- "Stephen Carmeron <stephenmcameron@gmail.com>",
+ "Stephen Cameron <stephenmcameron@gmail.com>",
NULL
};
const char *license[] = {
"program-name", "gfio",
"comments", "Gtk2 UI for fio",
"license", license_trans,
- "website", "http://git.kernel.dk/?p=fio.git;a=summary",
+ "website", "http://git.kernel.dk/cgit/fio/",
"authors", authors,
"version", fio_version_string,
- "copyright", "© 2012 Jens Axboe <axboe@kernel.dk>",
+ "copyright", "© 2012
-2017 Jens Axboe <axboe@kernel.dk>",
"logo-icon-name", "fio",
/* Must be last: */
"wrap-license", TRUE,
{ "Quit", GTK_STOCK_QUIT, NULL, "<Control>Q", NULL, G_CALLBACK(quit_clicked) },
{ "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) },
};
-static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
+static gint nmenu_items = ARRAY_SIZE(menu_items);
static const gchar *ui_string = " \
<ui> \
}
void gfio_ui_setup(GtkSettings *settings, GtkWidget *menubar,
- GtkWidget *vbox, GtkUIManager *ui_manager)
+ GtkWidget *vbox, GtkUIManager *ui_manager)
{
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
}
static void combo_entry_changed(GtkComboBox *box, gpointer data)
g_signal_connect(ge->eta.names, "changed", G_CALLBACK(combo_entry_changed), ge);
g_signal_connect(ge->eta.names, "destroy", G_CALLBACK(combo_entry_destroy), ge);
ge->eta.iotype.entry = new_info_entry_in_frame(probe_box, "IO");
- ge->eta.bs.entry = new_info_entry_in_frame(probe_box, "Blocksize (Read/Write)");
+ ge->eta.bs.entry = new_info_entry_in_frame(probe_box, "Blocksize (Read/Write/Trim)");
ge->eta.ioengine.entry = new_info_entry_in_frame(probe_box, "IO Engine");
ge->eta.iodepth.entry = new_info_entry_in_frame(probe_box, "IO Depth");
ge->eta.jobs = new_info_entry_in_frame(probe_box, "Jobs");
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
- ge->eta.read_bw = new_info_entry_in_frame(probe_box, "Read BW");
- ge->eta.read_iops = new_info_entry_in_frame(probe_box, "IOPS");
- ge->eta.write_bw = new_info_entry_in_frame(probe_box, "Write BW");
- ge->eta.write_iops = new_info_entry_in_frame(probe_box, "IOPS");
+ ge->eta.read_bw = new_info_entry_in_frame_rgb(probe_box, "Read BW", GFIO_READ_R, GFIO_READ_G, GFIO_READ_B);
+ ge->eta.read_iops = new_info_entry_in_frame_rgb(probe_box, "Read IOPS", GFIO_READ_R, GFIO_READ_G, GFIO_READ_B);
+ ge->eta.write_bw = new_info_entry_in_frame_rgb(probe_box, "Write BW", GFIO_WRITE_R, GFIO_WRITE_G, GFIO_WRITE_B);
+ ge->eta.write_iops = new_info_entry_in_frame_rgb(probe_box, "Write IOPS", GFIO_WRITE_R, GFIO_WRITE_G, GFIO_WRITE_B);
+ ge->eta.trim_bw = new_info_entry_in_frame_rgb(probe_box, "Trim BW", GFIO_TRIM_R, GFIO_TRIM_G, GFIO_TRIM_B);
+ ge->eta.trim_iops = new_info_entry_in_frame_rgb(probe_box, "Trim IOPS", GFIO_TRIM_R, GFIO_TRIM_G, GFIO_TRIM_B);
/*
* Only add this if we have a commit rate
ge->graphs.drawing_area = gtk_drawing_area_new();
gtk_widget_set_size_request(GTK_WIDGET(ge->graphs.drawing_area),
DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
- gtk_widget_modify_bg(ge->graphs.drawing_area, GTK_STATE_NORMAL, &white);
- g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "expose_event",
+ gtk_widget_modify_bg(ge->graphs.drawing_area, GTK_STATE_NORMAL, &gfio_color_lightyellow);
+ g_signal_connect(G_OBJECT(ge->graphs.drawing_area), GFIO_DRAW_EVENT,
G_CALLBACK(on_expose_drawing_area), &ge->graphs);
g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ge->graphs);
setup_graphs(&ge->graphs);
/*
- * Set up alignments for widgets at the bottom of ui,
+ * Set up alignments for widgets at the bottom of ui,
* align bottom left, expand horizontally but not vertically
*/
bottom_align = gtk_alignment_new(0, 1, 1, 0);
gtk_container_add(GTK_CONTAINER(bottom_align), ge->buttonbox);
gtk_box_pack_start(GTK_BOX(main_vbox), bottom_align, FALSE, FALSE, 0);
- add_buttons(ge, buttonspeclist, ARRAYSIZE(buttonspeclist));
+ add_buttons(ge, buttonspeclist, ARRAY_SIZE(buttonspeclist));
/*
* Set up thread status progress bar
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
ui->eta.jobs = new_info_entry_in_frame(probe_box, "Running");
- ui->eta.read_bw = new_info_entry_in_frame(probe_box, "Read BW");
- ui->eta.read_iops = new_info_entry_in_frame(probe_box, "IOPS");
- ui->eta.write_bw = new_info_entry_in_frame(probe_box, "Write BW");
- ui->eta.write_iops = new_info_entry_in_frame(probe_box, "IOPS");
+ ui->eta.read_bw = new_info_entry_in_frame_rgb(probe_box, "Read BW", GFIO_READ_R, GFIO_READ_G, GFIO_READ_B);
+ ui->eta.read_iops = new_info_entry_in_frame_rgb(probe_box, "IOPS", GFIO_READ_R, GFIO_READ_G, GFIO_READ_B);
+ ui->eta.write_bw = new_info_entry_in_frame_rgb(probe_box, "Write BW", GFIO_WRITE_R, GFIO_WRITE_G, GFIO_WRITE_B);
+ ui->eta.write_iops = new_info_entry_in_frame_rgb(probe_box, "IOPS", GFIO_WRITE_R, GFIO_WRITE_G, GFIO_WRITE_B);
+ ui->eta.trim_bw = new_info_entry_in_frame_rgb(probe_box, "Trim BW", GFIO_TRIM_R, GFIO_TRIM_G, GFIO_TRIM_B);
+ ui->eta.trim_iops = new_info_entry_in_frame_rgb(probe_box, "IOPS", GFIO_TRIM_R, GFIO_TRIM_G, GFIO_TRIM_B);
/*
* Only add this if we have a commit rate
ui->graphs.drawing_area = gtk_drawing_area_new();
gtk_widget_set_size_request(GTK_WIDGET(ui->graphs.drawing_area),
DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
- gtk_widget_modify_bg(ui->graphs.drawing_area, GTK_STATE_NORMAL, &white);
- g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "expose_event",
+ gtk_widget_modify_bg(ui->graphs.drawing_area, GTK_STATE_NORMAL, &gfio_color_lightyellow);
+ g_signal_connect(G_OBJECT(ui->graphs.drawing_area), GFIO_DRAW_EVENT,
G_CALLBACK(on_expose_drawing_area), &ui->graphs);
g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ui->graphs);
setup_graphs(&ui->graphs);
/*
- * Set up alignments for widgets at the bottom of ui,
+ * Set up alignments for widgets at the bottom of ui,
* align bottom left, expand horizontally but not vertically
*/
bottom_align = gtk_alignment_new(0, 1, 1, 0);
}
set_job_menu_visible(ui, 1);
- ge = get_ge_from_page(page, NULL);
+ ge = get_ge_from_page(ui, page, NULL);
if (ge)
update_button_states(ui, ge);
}
static void drag_and_drop_received(GtkWidget *widget, GdkDragContext *ctx,
- gint x, gint y, GtkSelectionData *data,
- guint info, guint time)
+ gint x, gint y, GtkSelectionData *seldata,
+ guint info, guint time, gpointer *data)
{
- struct gui *ui = &main_ui;
+ struct gui *ui = (struct gui *) data;
gchar **uris;
GtkWidget *source;
- int i;
source = gtk_drag_get_source_widget(ctx);
if (source && widget == gtk_widget_get_toplevel(source)) {
return;
}
- uris = gtk_selection_data_get_uris(data);
+ uris = gtk_selection_data_get_uris(seldata);
if (!uris) {
gtk_drag_finish(ctx, FALSE, FALSE, time);
return;
}
- i = 0;
- while (uris[i]) {
- if (do_file_open_with_tab(ui, uris[i]))
- break;
- i++;
- }
+ if (uris[0])
+ do_file_open_with_tab(ui, uris[0]);
gtk_drag_finish(ctx, TRUE, FALSE, time);
g_strfreev(uris);
* Without it, the update that happens in gfio_update_thread_status
* doesn't really happen in a timely fashion, you need expose events
*/
+#if !GLIB_CHECK_VERSION(2, 31, 0)
if (!g_thread_supported())
g_thread_init(NULL);
+#endif
+
gdk_threads_init();
gtk_init(argc, argv);
settings = gtk_settings_get_default();
gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "gfio setting");
+#if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init();
- gdk_color_parse("white", &white);
-
+#endif
+ gdk_color_parse("#fffff4", &gfio_color_lightyellow);
+ gdk_color_parse("white", &gfio_color_white);
+
ui->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(ui->window), "fio");
gtk_window_set_default_size(GTK_WINDOW(ui->window), 1024, 768);
- g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), NULL);
- g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), NULL);
+ g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), ui);
+ g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), ui);
ui->vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(ui->window), ui->vbox);
gtk_container_add(GTK_CONTAINER(ui->vbox), ui->notebook);
vbox = new_main_page(ui);
- gtk_drag_dest_set(GTK_WIDGET(ui->window), GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY);
+ gtk_drag_dest_set(GTK_WIDGET(ui->window), GTK_DEST_DEFAULT_ALL, NULL, 1, GDK_ACTION_COPY);
gtk_drag_dest_add_uri_targets(GTK_WIDGET(ui->window));
g_signal_connect(ui->window, "drag-data-received", G_CALLBACK(drag_and_drop_received), ui);
if (fio_init_options())
return 1;
+ gopt_init();
+
memset(&main_ui, 0, sizeof(main_ui));
- INIT_FLIST_HEAD(&main_ui.list);
+ main_ui.ge_hash = g_hash_table_new(g_int_hash, g_int_equal);
init_ui(&argc, &argv, &main_ui);
gdk_threads_enter();
gtk_main();
gdk_threads_leave();
+
+ g_hash_table_destroy(main_ui.ge_hash);
+
+ gopt_exit();
return 0;
}
projects / fio.git / blobdiff