diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-25 11:33:41 +0100 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-25 11:34:00 +0100 | 
| commit | a2d28d0c198b65fac28ea6212f5f8edc77b29c27 (patch) | |
| tree | 130c1b4464f1eb685e56ff2ce122e3e36bb52e88 /tools/perf/ui/gtk/browser.c | |
| parent | 203e04c16330c880538588e932743f404ee4fd66 (diff) | |
| parent | 2ae828786c65ab8f587647bd0f22f8fe00f1f238 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
. Allow skipping problematic entries in 'perf test'.
. Fix some namespace problems in the event parsing routines.
. Add 'perf test' entry to make sure the python binding doesn't have
  linking problems.
. Adjust 'perf test' attr tests verbosity levels.
. Make tools/perf build with GNU make v3.80, fix from Al Cooper.
. Do missing feature fallbacks in just one place, removing duplicated
  code in multiple tools.
. Fix some memory leaks, from David Ahern.
. Fix segfault when drawing out-of-bounds jumps, from Frederik Deweerdt.
. Allow of casting an array of char to string in 'perf probe', from
  Hyeoncheol Lee.
. Add support for wildcard in tracepoint system name, from Jiri Olsa.
. Update FSF postal address to be URL's, from Jon Stanley.
. Add anonymous huge page recognition, from Joshua Zhu.
. Remove some needless feature test checks, from Namhyung Kim.
. Multiple improvements to the sort routines, from Namhyung Kim.
. Fix warning on '>=' operator in libtraceevent, from Namhyung Kim.
. Use ARRAY_SIZE instead of reinventing it in 'perf script' and 'perf kmem',
  from Sasha Levin.
. Remove some redundant checks, from Sasha Levin.
. Test correct variable after allocation in libtraceevent, fix from Sasha Levin.
. Mark branch_info maps as referenced, fix from Stephane Eranian.
. Fix PMU format parsing test failure, from Sukadev Bhattiprolu.
. Fix possible (unlikely) buffer overflow, from Thomas Jarosch.
. Multiple 'perf script' fixes, from Tom Zanussi.
. Add missing field in PERF_RECORD_SAMPLE documentation, from Vince Weaver.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/gtk/browser.c')
| -rw-r--r-- | tools/perf/ui/gtk/browser.c | 227 | 
1 files changed, 5 insertions, 222 deletions
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c index e59ba337f494..c95012cdb438 100644 --- a/tools/perf/ui/gtk/browser.c +++ b/tools/perf/ui/gtk/browser.c @@ -8,15 +8,13 @@  #include <signal.h> -#define MAX_COLUMNS			32 - -static void perf_gtk__signal(int sig) +void perf_gtk__signal(int sig)  {  	perf_gtk__exit(false);  	psignal(sig, "perf");  } -static void perf_gtk__resize_window(GtkWidget *window) +void perf_gtk__resize_window(GtkWidget *window)  {  	GdkRectangle rect;  	GdkScreen *screen; @@ -36,7 +34,7 @@ static void perf_gtk__resize_window(GtkWidget *window)  	gtk_window_resize(GTK_WINDOW(window), width, height);  } -static const char *perf_gtk__get_percent_color(double percent) +const char *perf_gtk__get_percent_color(double percent)  {  	if (percent >= MIN_RED)  		return "<span fgcolor='red'>"; @@ -45,147 +43,8 @@ static const char *perf_gtk__get_percent_color(double percent)  	return NULL;  } -#define HPP__COLOR_FN(_name, _field)						\ -static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp,			\ -					 struct hist_entry *he)			\ -{										\ -	struct hists *hists = he->hists;					\ -	double percent = 100.0 * he->stat._field / hists->stats.total_period;	\ -	const char *markup;							\ -	int ret = 0;								\ -										\ -	markup = perf_gtk__get_percent_color(percent);				\ -	if (markup)								\ -		ret += scnprintf(hpp->buf, hpp->size, "%s", markup);		\ -	ret += scnprintf(hpp->buf + ret, hpp->size - ret, "%6.2f%%", percent); 	\ -	if (markup)								\ -		ret += scnprintf(hpp->buf + ret, hpp->size - ret, "</span>"); 	\ -										\ -	return ret;								\ -} - -HPP__COLOR_FN(overhead, period) -HPP__COLOR_FN(overhead_sys, period_sys) -HPP__COLOR_FN(overhead_us, period_us) -HPP__COLOR_FN(overhead_guest_sys, period_guest_sys) -HPP__COLOR_FN(overhead_guest_us, period_guest_us) - -#undef HPP__COLOR_FN - -void perf_gtk__init_hpp(void) -{ -	perf_hpp__column_enable(PERF_HPP__OVERHEAD); - -	perf_hpp__init(); - -	perf_hpp__format[PERF_HPP__OVERHEAD].color = -				perf_gtk__hpp_color_overhead; -	perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color = -				perf_gtk__hpp_color_overhead_sys; -	perf_hpp__format[PERF_HPP__OVERHEAD_US].color = -				perf_gtk__hpp_color_overhead_us; -	perf_hpp__format[PERF_HPP__OVERHEAD_GUEST_SYS].color = -				perf_gtk__hpp_color_overhead_guest_sys; -	perf_hpp__format[PERF_HPP__OVERHEAD_GUEST_US].color = -				perf_gtk__hpp_color_overhead_guest_us; -} - -static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists) -{ -	struct perf_hpp_fmt *fmt; -	GType col_types[MAX_COLUMNS]; -	GtkCellRenderer *renderer; -	struct sort_entry *se; -	GtkListStore *store; -	struct rb_node *nd; -	GtkWidget *view; -	int col_idx; -	int nr_cols; -	char s[512]; - -	struct perf_hpp hpp = { -		.buf		= s, -		.size		= sizeof(s), -	}; - -	nr_cols = 0; - -	perf_hpp__for_each_format(fmt) -		col_types[nr_cols++] = G_TYPE_STRING; - -	list_for_each_entry(se, &hist_entry__sort_list, list) { -		if (se->elide) -			continue; - -		col_types[nr_cols++] = G_TYPE_STRING; -	} - -	store = gtk_list_store_newv(nr_cols, col_types); - -	view = gtk_tree_view_new(); - -	renderer = gtk_cell_renderer_text_new(); - -	col_idx = 0; - -	perf_hpp__for_each_format(fmt) { -		fmt->header(&hpp); -		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), -							    -1, s, -							    renderer, "markup", -							    col_idx++, NULL); -	} - -	list_for_each_entry(se, &hist_entry__sort_list, list) { -		if (se->elide) -			continue; - -		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), -							    -1, se->se_header, -							    renderer, "text", -							    col_idx++, NULL); -	} - -	gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store)); - -	g_object_unref(GTK_TREE_MODEL(store)); - -	for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) { -		struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); -		GtkTreeIter iter; - -		if (h->filtered) -			continue; - -		gtk_list_store_append(store, &iter); - -		col_idx = 0; - -		perf_hpp__for_each_format(fmt) { -			if (fmt->color) -				fmt->color(&hpp, h); -			else -				fmt->entry(&hpp, h); - -			gtk_list_store_set(store, &iter, col_idx++, s, -1); -		} - -		list_for_each_entry(se, &hist_entry__sort_list, list) { -			if (se->elide) -				continue; - -			se->se_snprintf(h, s, ARRAY_SIZE(s), -					hists__col_len(hists, se->se_width_idx)); - -			gtk_list_store_set(store, &iter, col_idx++, s, -1); -		} -	} - -	gtk_container_add(GTK_CONTAINER(window), view); -} -  #ifdef HAVE_GTK_INFO_BAR -static GtkWidget *perf_gtk__setup_info_bar(void) +GtkWidget *perf_gtk__setup_info_bar(void)  {  	GtkWidget *info_bar;  	GtkWidget *label; @@ -212,7 +71,7 @@ static GtkWidget *perf_gtk__setup_info_bar(void)  }  #endif -static GtkWidget *perf_gtk__setup_statusbar(void) +GtkWidget *perf_gtk__setup_statusbar(void)  {  	GtkWidget *stbar;  	unsigned ctxid; @@ -226,79 +85,3 @@ static GtkWidget *perf_gtk__setup_statusbar(void)  	return stbar;  } - -int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, -				  const char *help, -				  struct hist_browser_timer *hbt __maybe_unused) -{ -	struct perf_evsel *pos; -	GtkWidget *vbox; -	GtkWidget *notebook; -	GtkWidget *info_bar; -	GtkWidget *statbar; -	GtkWidget *window; - -	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); - -	window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - -	gtk_window_set_title(GTK_WINDOW(window), "perf report"); - -	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(); - -	list_for_each_entry(pos, &evlist->entries, node) { -		struct hists *hists = &pos->hists; -		const char *evname = perf_evsel__name(pos); -		GtkWidget *scrolled_window; -		GtkWidget *tab_label; - -		scrolled_window = gtk_scrolled_window_new(NULL, NULL); - -		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), -							GTK_POLICY_AUTOMATIC, -							GTK_POLICY_AUTOMATIC); - -		perf_gtk__show_hists(scrolled_window, hists); - -		tab_label = gtk_label_new(evname); - -		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label); -	} - -	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); - -	info_bar = perf_gtk__setup_info_bar(); -	if (info_bar) -		gtk_box_pack_start(GTK_BOX(vbox), info_bar, 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); - -	gtk_widget_show_all(window); - -	perf_gtk__resize_window(window); - -	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); - -	ui_helpline__push(help); - -	gtk_main(); - -	perf_gtk__deactivate_context(&pgctx); - -	return 0; -}  | 
