Commit 7a60ba94 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf gtk/annotate: Support multiple event annotation

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.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1360227734-375-3-git-send-email-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2b676bf0
...@@ -227,6 +227,10 @@ static int __cmd_annotate(struct perf_annotate *ann) ...@@ -227,6 +227,10 @@ static int __cmd_annotate(struct perf_annotate *ann)
ui__error("The %s file has no samples!\n", session->filename); ui__error("The %s file has no samples!\n", session->filename);
goto out_delete; goto out_delete;
} }
if (use_browser == 2)
perf_gtk__show_annotations();
out_delete: out_delete:
/* /*
* Speed up the exit process, for large files this can * Speed up the exit process, for large files this can
......
...@@ -126,14 +126,19 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym, ...@@ -126,14 +126,19 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx, int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
struct hist_browser_timer *hbt) struct hist_browser_timer *hbt)
{ {
GtkWidget *vbox;
GtkWidget *notebook;
GtkWidget *infobar;
GtkWidget *statbar;
GtkWidget *window; GtkWidget *window;
GtkWidget *notebook;
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *tab_label; GtkWidget *tab_label;
if (perf_gtk__is_active_context(pgctx)) {
window = pgctx->main_window;
notebook = pgctx->notebook;
} else {
GtkWidget *vbox;
GtkWidget *infobar;
GtkWidget *statbar;
signal(SIGSEGV, perf_gtk__signal); signal(SIGSEGV, perf_gtk__signal);
signal(SIGFPE, perf_gtk__signal); signal(SIGFPE, perf_gtk__signal);
signal(SIGINT, perf_gtk__signal); signal(SIGINT, perf_gtk__signal);
...@@ -151,6 +156,22 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx, ...@@ -151,6 +156,22 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
notebook = gtk_notebook_new(); 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);
}
scrolled_window = gtk_scrolled_window_new(NULL, NULL); scrolled_window = gtk_scrolled_window_new(NULL, NULL);
tab_label = gtk_label_new(sym->name); tab_label = gtk_label_new(sym->name);
...@@ -160,19 +181,19 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx, ...@@ -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, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window,
tab_label); tab_label);
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
infobar = perf_gtk__setup_info_bar(); perf_gtk__annotate_symbol(scrolled_window, sym, map, evidx, hbt);
if (infobar) return 0;
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); 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); gtk_widget_show_all(window);
perf_gtk__resize_window(window); perf_gtk__resize_window(window);
...@@ -181,5 +202,4 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx, ...@@ -181,5 +202,4 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
gtk_main(); gtk_main();
perf_gtk__deactivate_context(&pgctx); perf_gtk__deactivate_context(&pgctx);
return 0;
} }
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
struct perf_gtk_context { struct perf_gtk_context {
GtkWidget *main_window; GtkWidget *main_window;
GtkWidget *notebook;
#ifdef HAVE_GTK_INFO_BAR #ifdef HAVE_GTK_INFO_BAR
GtkWidget *info_bar; GtkWidget *info_bar;
......
...@@ -164,6 +164,8 @@ static inline int hist_entry__gtk_annotate(struct hist_entry *he, int evidx, ...@@ -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); return symbol__gtk_annotate(he->ms.sym, he->ms.map, evidx, hbt);
} }
void perf_gtk__show_annotations(void);
#else #else
static inline int hist_entry__gtk_annotate(struct hist_entry *he __maybe_unused, static inline int hist_entry__gtk_annotate(struct hist_entry *he __maybe_unused,
int evidx __maybe_unused, int evidx __maybe_unused,
...@@ -172,6 +174,8 @@ static inline int hist_entry__gtk_annotate(struct hist_entry *he __maybe_unused, ...@@ -172,6 +174,8 @@ static inline int hist_entry__gtk_annotate(struct hist_entry *he __maybe_unused,
{ {
return 0; return 0;
} }
static inline void perf_gtk__show_annotations(void) {}
#endif #endif
extern const char *disassembler_style; extern const char *disassembler_style;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment