lkml.org 
[lkml]   [2013]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/7] perf gtk/annotate: Support multiple event annotation
    Date
    From: Namhyung Kim <namhyung.kim@lge.com>

    Show multiple annotation result for each evsel. Each result
    represents the most frquently sampled symbol/function for the evsel
    and it will be shown in a tab window.

    For this add a reference to main container (notebook) to the pgctx.
    At the first call to annotate browser, hist_entry__find_annotations()
    will setup a new browser, and next calls will add new tabs to the
    browser. But it requires final perf_gtk__show_annotations() to start
    processing GUI events.

    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Pekka Enberg <penberg@kernel.org>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/builtin-annotate.c | 4 +++
    tools/perf/ui/gtk/annotate.c | 74 +++++++++++++++++++++++++++----------------
    tools/perf/ui/gtk/gtk.h | 1 +
    tools/perf/util/annotate.h | 4 +++
    4 files changed, 56 insertions(+), 27 deletions(-)

    diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
    index 9d758c9611a5..68e3a16abd3d 100644
    --- a/tools/perf/builtin-annotate.c
    +++ b/tools/perf/builtin-annotate.c
    @@ -227,6 +227,10 @@ static int __cmd_annotate(struct perf_annotate *ann)
    ui__error("The %s file has no samples!\n", session->filename);
    goto out_delete;
    }
    +
    + if (use_browser == 2)
    + perf_gtk__show_annotations();
    +
    out_delete:
    /*
    * Speed up the exit process, for large files this can
    diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
    index 19d84fa327af..1ce89f2558fa 100644
    --- a/tools/perf/ui/gtk/annotate.c
    +++ b/tools/perf/ui/gtk/annotate.c
    @@ -126,31 +126,52 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
    int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
    struct hist_browser_timer *hbt)
    {
    - GtkWidget *vbox;
    - GtkWidget *notebook;
    - GtkWidget *infobar;
    - GtkWidget *statbar;
    GtkWidget *window;
    + GtkWidget *notebook;
    GtkWidget *scrolled_window;
    GtkWidget *tab_label;

    - signal(SIGSEGV, perf_gtk__signal);
    - signal(SIGFPE, perf_gtk__signal);
    - signal(SIGINT, perf_gtk__signal);
    - signal(SIGQUIT, perf_gtk__signal);
    - signal(SIGTERM, perf_gtk__signal);
    + if (perf_gtk__is_active_context(pgctx)) {
    + window = pgctx->main_window;
    + notebook = pgctx->notebook;
    + } else {
    + GtkWidget *vbox;
    + GtkWidget *infobar;
    + GtkWidget *statbar;

    - window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    - gtk_window_set_title(GTK_WINDOW(window), "perf annotate");
    + signal(SIGSEGV, perf_gtk__signal);
    + signal(SIGFPE, perf_gtk__signal);
    + signal(SIGINT, perf_gtk__signal);
    + signal(SIGQUIT, perf_gtk__signal);
    + signal(SIGTERM, perf_gtk__signal);

    - g_signal_connect(window, "delete_event", gtk_main_quit, NULL);
    + window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    + gtk_window_set_title(GTK_WINDOW(window), "perf annotate");

    - pgctx = perf_gtk__activate_context(window);
    - if (!pgctx)
    - return -1;
    + g_signal_connect(window, "delete_event", gtk_main_quit, NULL);
    +
    + pgctx = perf_gtk__activate_context(window);
    + if (!pgctx)
    + return -1;
    +
    + vbox = gtk_vbox_new(FALSE, 0);
    + notebook = gtk_notebook_new();
    + pgctx->notebook = notebook;
    +
    + gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
    +
    + infobar = perf_gtk__setup_info_bar();
    + if (infobar) {
    + gtk_box_pack_start(GTK_BOX(vbox), infobar,
    + FALSE, FALSE, 0);
    + }
    +
    + statbar = perf_gtk__setup_statusbar();
    + gtk_box_pack_start(GTK_BOX(vbox), statbar, FALSE, FALSE, 0);
    +
    + gtk_container_add(GTK_CONTAINER(window), vbox);
    + }

    - vbox = gtk_vbox_new(FALSE, 0);
    - notebook = gtk_notebook_new();
    scrolled_window = gtk_scrolled_window_new(NULL, NULL);
    tab_label = gtk_label_new(sym->name);

    @@ -160,19 +181,19 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,

    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window,
    tab_label);
    - gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
    -
    - infobar = perf_gtk__setup_info_bar();
    - if (infobar)
    - gtk_box_pack_start(GTK_BOX(vbox), infobar, FALSE, FALSE, 0);

    - statbar = perf_gtk__setup_statusbar();
    - gtk_box_pack_start(GTK_BOX(vbox), statbar, FALSE, FALSE, 0);
    + perf_gtk__annotate_symbol(scrolled_window, sym, map, evidx, hbt);
    + return 0;
    +}

    - gtk_container_add(GTK_CONTAINER(window), vbox);
    +void perf_gtk__show_annotations(void)
    +{
    + GtkWidget *window;

    - perf_gtk__annotate_symbol(scrolled_window, sym, map, evidx, hbt);
    + if (!perf_gtk__is_active_context(pgctx))
    + return;

    + window = pgctx->main_window;
    gtk_widget_show_all(window);

    perf_gtk__resize_window(window);
    @@ -181,5 +202,4 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
    gtk_main();

    perf_gtk__deactivate_context(&pgctx);
    - return 0;
    }
    diff --git a/tools/perf/ui/gtk/gtk.h b/tools/perf/ui/gtk/gtk.h
    index 5d3693754828..3d96785ef155 100644
    --- a/tools/perf/ui/gtk/gtk.h
    +++ b/tools/perf/ui/gtk/gtk.h
    @@ -10,6 +10,7 @@

    struct perf_gtk_context {
    GtkWidget *main_window;
    + GtkWidget *notebook;

    #ifdef HAVE_GTK_INFO_BAR
    GtkWidget *info_bar;
    diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
    index a8ccbda4aeb7..c422440fe611 100644
    --- a/tools/perf/util/annotate.h
    +++ b/tools/perf/util/annotate.h
    @@ -164,6 +164,8 @@ static inline int hist_entry__gtk_annotate(struct hist_entry *he, int evidx,
    {
    return symbol__gtk_annotate(he->ms.sym, he->ms.map, evidx, hbt);
    }
    +
    +void perf_gtk__show_annotations(void);
    #else
    static inline int hist_entry__gtk_annotate(struct hist_entry *he __maybe_unused,
    int evidx __maybe_unused,
    @@ -172,6 +174,8 @@ static inline int hist_entry__gtk_annotate(struct hist_entry *he __maybe_unused,
    {
    return 0;
    }
    +
    +static inline void perf_gtk__show_annotations(void) {}
    #endif

    extern const char *disassembler_style;
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-02-07 10:43    [W:4.104 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site