perf ui gtk: Implement ui_progress functions

Implement progress update function for GTK2 front end.

Note that since it will be called before gtk main loop so that we should
call gtk event loop handler directly.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1352813436-14173-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index f8466b49b9223195990dae966e31d38b0e31edb6..5a9075ea218ec087b2ac8871abfde56208d7f246 100644 (file)
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -648,6 +648,7 @@ ifndef NO_GTK2
                LIB_OBJS += $(OUTPUT)ui/gtk/setup.o
                LIB_OBJS += $(OUTPUT)ui/gtk/util.o
                LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o
+               LIB_OBJS += $(OUTPUT)ui/gtk/progress.o
                # Make sure that it'd be included only once.
                ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),)
                        LIB_OBJS += $(OUTPUT)ui/setup.o

diff --git a/tools/perf/ui/gtk/gtk.h b/tools/perf/ui/gtk/gtk.h
index 687af0bba1878de6838206864a5e7b7d061a859e..856320e2cc05c796a5774de845f24fda78dcef3e 100644 (file)
--- a/tools/perf/ui/gtk/gtk.h
+++ b/tools/perf/ui/gtk/gtk.h
@@ -30,6 +30,7 @@ struct perf_gtk_context *perf_gtk__activate_context(GtkWidget *window);
 int perf_gtk__deactivate_context(struct perf_gtk_context **ctx);
 
 void perf_gtk__init_helpline(void);
+void perf_gtk__init_progress(void);
 void perf_gtk__init_hpp(void);
 
 #ifndef HAVE_GTK_INFO_BAR

diff --git a/tools/perf/ui/gtk/progress.c b/tools/perf/ui/gtk/progress.c
new file mode 100644 (file)
index 0000000..903426f
--- /dev/null
+++ b/tools/perf/ui/gtk/progress.c
@@ -0,0 +1,50 @@
+#include <inttypes.h>
+
+#include "gtk.h"
+#include "../progress.h"
+#include "util.h"
+
+static GtkWidget *dialog;
+static GtkWidget *progress;
+
+static void gtk_progress_update(u64 curr, u64 total, const char *title)
+{
+       double fraction = total ? 1.0 * curr / total : 0.0;
+       char buf[1024];
+
+       if (dialog == NULL) {
+               GtkWidget *vbox = gtk_vbox_new(TRUE, 5);
+               GtkWidget *label = gtk_label_new(title);
+
+               dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+               progress = gtk_progress_bar_new();
+
+               gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, FALSE, 3);
+               gtk_box_pack_start(GTK_BOX(vbox), progress, TRUE, TRUE, 3);
+
+               gtk_container_add(GTK_CONTAINER(dialog), vbox);
+
+               gtk_window_set_title(GTK_WINDOW(dialog), "perf");
+               gtk_window_resize(GTK_WINDOW(dialog), 300, 80);
+               gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+
+               gtk_widget_show_all(dialog);
+       }
+
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), fraction);
+       snprintf(buf, sizeof(buf), "%"PRIu64" / %"PRIu64, curr, total);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), buf);
+
+       /* we didn't call gtk_main yet, so do it manually */
+       while (gtk_events_pending())
+               gtk_main_iteration();
+}
+
+static struct ui_progress gtk_progress_fns = {
+       .update         = gtk_progress_update,
+};
+
+void perf_gtk__init_progress(void)
+{
+       progress_fns = &gtk_progress_fns;
+}

diff --git a/tools/perf/ui/gtk/setup.c b/tools/perf/ui/gtk/setup.c
index 3c4c6ef782838f0627cb0ef796daa9892a8196d1..6c2dd2e423f3a6a160bcbd879b71c6134ef9d460 100644 (file)
--- a/tools/perf/ui/gtk/setup.c
+++ b/tools/perf/ui/gtk/setup.c
@@ -8,7 +8,9 @@ int perf_gtk__init(void)
 {
        perf_error__register(&perf_gtk_eops);
        perf_gtk__init_helpline();
+       perf_gtk__init_progress();
        perf_gtk__init_hpp();
+
        return gtk_init_check(NULL, NULL) ? 0 : -1;
 }