Merge branch 'master' of https://github.com/celestinechen/fio

[fio.git] / gfio.c

diff --git a/gfio.c b/gfio.c
index 7c92a5099f9f6418340283f45fa4fc85c2afb16d..10c9b0947bbde51623f0f58b5a0ef5d43b30e4d6 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,9 @@
 #include "gclient.h"
 #include "graph.h"
 
-static int gfio_server_running;
+struct gui main_ui;
+
+static bool gfio_server_running;
 static unsigned int gfio_graph_limit = 100;
 
 GdkColor gfio_color_white;
@@ -222,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
        switch (ge->state) {
        default:
                gfio_report_error(ge, "Bad client state: %u\n", ge->state);
-               /* fall through to new state */
+               /* fall-through */
        case GE_STATE_NEW:
                connect_state = 1;
                edit_state = 1;
@@ -460,10 +463,10 @@ static int send_job_file(struct gui_entry *ge)
 static void *server_thread(void *arg)
 {
        fio_server_create_sk_key();
-       is_backend = 1;
-       gfio_server_running = 1;
+       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;
 }
@@ -471,7 +474,7 @@ static void *server_thread(void *arg)
 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);
        }
@@ -727,8 +730,7 @@ static struct gui_entry *alloc_new_gui_entry(struct gui *ui)
 {
        struct gui_entry *ge;
 
-       ge = malloc(sizeof(*ge));
-       memset(ge, 0, sizeof(*ge));
+       ge = calloc(1, sizeof(*ge));
        ge->state = GE_STATE_NEW;
        ge->ui = ui;
        return ge;
@@ -1243,7 +1245,7 @@ static void about_dialog(GtkWidget *w, gpointer data)
                "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,
@@ -1271,7 +1273,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 = ARRAY_SIZE(menu_items);
+static gint nmenu_items = FIO_ARRAY_SIZE(menu_items);
 
 static const gchar *ui_string = " \
        <ui> \
@@ -1444,7 +1446,7 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
        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, ARRAY_SIZE(buttonspeclist));
+       add_buttons(ge, buttonspeclist, FIO_ARRAY_SIZE(buttonspeclist));
 
        /*
         * Set up thread status progress bar