lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core

Browse Source
This commit is contained in:
Ingo Molnar
2011-10-17 21:43:43 +02:00
parent 53b0a61a9d 7bc7298d3f
commit ee8f967b15
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/builtin-top.c
View File

@@ -304,7 +304,9 @@ static void print_sym_table(void)
hists__collapse_resort_threaded(&top.sym_evsel->hists); hists__collapse_resort_threaded(&top.sym_evsel->hists);
hists__output_resort_threaded(&top.sym_evsel->hists); hists__output_resort_threaded(&top.sym_evsel->hists);
hists__decay_entries_threaded(&top.sym_evsel->hists); hists__decay_entries_threaded(&top.sym_evsel->hists,
top.hide_user_symbols,
top.hide_kernel_symbols);
hists__output_recalc_col_len(&top.sym_evsel->hists, winsize.ws_row - 3); hists__output_recalc_col_len(&top.sym_evsel->hists, winsize.ws_row - 3);
putchar('\n'); putchar('\n');
hists__fprintf(&top.sym_evsel->hists, NULL, false, false, hists__fprintf(&top.sym_evsel->hists, NULL, false, false,
@@ -436,6 +438,7 @@ static int key_mapped(int c)
case 'S': case 'S':
return 1; return 1;
case 'E': case 'E':
return top.evlist->nr_entries > 1 ? 1 : 0;
default: default:
break; break;
} }
@@ -555,7 +558,9 @@ static void perf_top__sort_new_samples(void *arg)
hists__collapse_resort_threaded(&t->sym_evsel->hists); hists__collapse_resort_threaded(&t->sym_evsel->hists);
hists__output_resort_threaded(&t->sym_evsel->hists); hists__output_resort_threaded(&t->sym_evsel->hists);
hists__decay_entries_threaded(&t->sym_evsel->hists); hists__decay_entries_threaded(&t->sym_evsel->hists,
top.hide_user_symbols,
top.hide_kernel_symbols);
hists__output_recalc_col_len(&t->sym_evsel->hists, winsize.ws_row - 3); hists__output_recalc_col_len(&t->sym_evsel->hists, winsize.ws_row - 3);
} }

17
tools/perf/util/hist.c
View File

@@ -108,7 +108,8 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
return he->period == 0; return he->period == 0;
} }
static void __hists__decay_entries(struct hists *hists, bool threaded) static void __hists__decay_entries(struct hists *hists, bool zap_user,
bool zap_kernel, bool threaded)
{ {
struct rb_node *next = rb_first(&hists->entries); struct rb_node *next = rb_first(&hists->entries);
struct hist_entry *n; struct hist_entry *n;
@@ -121,7 +122,10 @@ static void __hists__decay_entries(struct hists *hists, bool threaded)
* case some it gets new samples, we'll eventually free it when * case some it gets new samples, we'll eventually free it when
* the user stops browsing and it agains gets fully decayed. * the user stops browsing and it agains gets fully decayed.
*/ */
if (hists__decay_entry(hists, n) && !n->used) { if (((zap_user && n->level == '.') ||
(zap_kernel && n->level != '.') ||
hists__decay_entry(hists, n)) &&
!n->used) {
rb_erase(&n->rb_node, &hists->entries); rb_erase(&n->rb_node, &hists->entries);
if (sort__need_collapse || threaded) if (sort__need_collapse || threaded)
@@ -133,14 +137,15 @@ static void __hists__decay_entries(struct hists *hists, bool threaded)
} }
} }
void hists__decay_entries(struct hists *hists) void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel)
{ {
return __hists__decay_entries(hists, false); return __hists__decay_entries(hists, zap_user, zap_kernel, false);
} }
void hists__decay_entries_threaded(struct hists *hists) void hists__decay_entries_threaded(struct hists *hists,
bool zap_user, bool zap_kernel)
{ {
return __hists__decay_entries(hists, true); return __hists__decay_entries(hists, zap_user, zap_kernel, true);
} }
/* /*

5
tools/perf/util/hist.h
View File

@@ -78,8 +78,9 @@ void hists__output_resort_threaded(struct hists *hists);
void hists__collapse_resort(struct hists *self); void hists__collapse_resort(struct hists *self);
void hists__collapse_resort_threaded(struct hists *hists); void hists__collapse_resort_threaded(struct hists *hists);
void hists__decay_entries(struct hists *hists); void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel);
void hists__decay_entries_threaded(struct hists *hists); void hists__decay_entries_threaded(struct hists *hists, bool zap_user,
bool zap_kernel);
void hists__output_recalc_col_len(struct hists *hists, int max_rows); void hists__output_recalc_col_len(struct hists *hists, int max_rows);
void hists__inc_nr_events(struct hists *self, u32 type); void hists__inc_nr_events(struct hists *self, u32 type);

1
tools/perf/util/ui/helpline.h
View File

@@ -2,6 +2,7 @@
#define _PERF_UI_HELPLINE_H_ 1 #define _PERF_UI_HELPLINE_H_ 1
#include <stdio.h> #include <stdio.h>
#include <stdarg.h>
void ui_helpline__init(void); void ui_helpline__init(void);
void ui_helpline__pop(void); void ui_helpline__pop(void);