configure: attempt to link against tcmalloc by default if available

[fio.git] / gfio.c

diff --git a/gfio.c b/gfio.c
index 185dbd5c482456bc89d23ac14a041e79e2350a5a..28053968515f99340f51667aaffa337bdf733ebb 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -18,12 +18,13 @@
  *
  *  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>
@@ -37,7 +38,7 @@
 #include "gclient.h"
 #include "graph.h"
 
-static int gfio_server_running;
+static bool gfio_server_running;
 static unsigned int gfio_graph_limit = 100;
 
 GdkColor gfio_color_white;
@@ -444,12 +445,12 @@ static int send_job_file(struct gui_entry *ge)
        while (!flist_empty(&gc->o_list)) {
                struct gfio_client_options *gco;
 
-               gco = flist_entry(gc->o_list.next, struct gfio_client_options, list);
+               gco = flist_first_entry(&gc->o_list, struct gfio_client_options, list);
                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;
 
@@ -459,17 +460,19 @@ static int send_job_file(struct gui_entry *ge)
 
 static void *server_thread(void *arg)
 {
-       is_backend = 1;
-       gfio_server_running = 1;
+       fio_server_create_sk_key();
+       is_backend = true;
+       gfio_server_running = true;
        fio_start_server(NULL);
-       gfio_server_running = 0;
+       gfio_server_running = false;
+       fio_server_destroy_sk_key();
        return NULL;
 }
 
 static void gfio_start_server(struct gui *ui)
 {
        if (!gfio_server_running) {
-               gfio_server_running = 1;
+               gfio_server_running = true;
                pthread_create(&ui->server_t, NULL, server_thread, NULL);
                pthread_detach(ui->server_t);
        }
@@ -1213,7 +1216,7 @@ static void about_dialog(GtkWidget *w, gpointer data)
 {
        const char *authors[] = {
                "Jens Axboe <axboe@kernel.dk>",
-               "Stephen Carmeron <stephenmcameron@gmail.com>",
+               "Stephen Cameron <stephenmcameron@gmail.com>",
                NULL
        };
        const char *license[] = {
@@ -1238,10 +1241,10 @@ static void about_dialog(GtkWidget *w, gpointer data)
                "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,
@@ -1269,7 +1272,7 @@ static GtkActionEntry menu_items[] = {
        { "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> \
@@ -1384,7 +1387,7 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
        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");
@@ -1393,11 +1396,11 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
        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_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, "IOPS", 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, "IOPS", 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, "IOPS", 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
@@ -1677,14 +1680,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
         */
+#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();
+#endif
        gdk_color_parse("#fffff4", &gfio_color_lightyellow);
        gdk_color_parse("white", &gfio_color_white);