projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence compiler warnings
[fio.git]
/
gfio.c
diff --git
a/gfio.c
b/gfio.c
index 313894169a3976fe8a472ce9d748fa1f81c34daa..ce180911db343ae8b7b94054262f53ae023523a1 100644
(file)
--- a/
gfio.c
+++ b/
gfio.c
@@
-444,12
+444,12
@@
static int send_job_file(struct gui_entry *ge)
while (!flist_empty(&gc->o_list)) {
struct gfio_client_options *gco;
while (!flist_empty(&gc->o_list)) {
struct gfio_client_options *gco;
- gco = flist_
entry(gc->o_list.nex
t, struct gfio_client_options, list);
+ gco = flist_
first_entry(&gc->o_lis
t, struct gfio_client_options, list);
flist_del(&gco->list);
free(gco);
}
flist_del(&gco->list);
free(gco);
}
- ret = fio_client_send_ini(gc->client, ge->job_file);
+ ret = fio_client_send_ini(gc->client, ge->job_file
, false
);
if (!ret)
return 0;
if (!ret)
return 0;
@@
-459,10
+459,12
@@
static int send_job_file(struct gui_entry *ge)
static void *server_thread(void *arg)
{
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;
is_backend = 1;
gfio_server_running = 1;
fio_start_server(NULL);
gfio_server_running = 0;
+ fio_server_destroy_sk_key();
return NULL;
}
return NULL;
}
@@
-654,6
+656,12
@@
static void gfio_client_added(struct gui_entry *ge, struct fio_client *client)
gc->o_list_nr++;
}
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;
static void connect_clicked(GtkWidget *widget, gpointer data)
{
struct gui_entry *ge = data;
@@
-694,6
+702,7
@@
static void connect_clicked(GtkWidget *widget, gpointer data)
if (!ge->ui->handler_running)
pthread_create(&ge->ui->t, NULL, job_thread, ge->ui);
gfio_set_state(ge, GE_STATE_CONNECTED);
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 {
gfio_report_error(ge, "Failed to connect to %s: %s\n", ge->client->client->hostname, strerror(-ret));
}
@@
-1670,14
+1679,19
@@
static void init_ui(int *argc, char **argv[], struct gui *ui)
* Without it, the update that happens in gfio_update_thread_status
* doesn't really happen in a timely fashion, you need expose events
*/
* 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);
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");
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();
g_type_init();
+#endif
gdk_color_parse("#fffff4", &gfio_color_lightyellow);
gdk_color_parse("white", &gfio_color_white);
gdk_color_parse("#fffff4", &gfio_color_lightyellow);
gdk_color_parse("white", &gfio_color_white);