Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ee8f967b
Commit
ee8f967b
authored
Oct 17, 2011
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'perf/core' of
git://github.com/acmel/linux
into perf/core
parents
53b0a61a
7bc7298d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
10 deletions
+22
-10
tools/perf/builtin-top.c
tools/perf/builtin-top.c
+7
-2
tools/perf/util/hist.c
tools/perf/util/hist.c
+11
-6
tools/perf/util/hist.h
tools/perf/util/hist.h
+3
-2
tools/perf/util/ui/helpline.h
tools/perf/util/ui/helpline.h
+1
-0
No files found.
tools/perf/builtin-top.c
View file @
ee8f967b
...
@@ -304,7 +304,9 @@ static void print_sym_table(void)
...
@@ -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)
...
@@ -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)
...
@@ -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
);
}
}
...
...
tools/perf/util/hist.c
View file @
ee8f967b
...
@@ -108,7 +108,8 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
...
@@ -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)
...
@@ -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)
...
@@ -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
);
}
}
/*
/*
...
...
tools/perf/util/hist.h
View file @
ee8f967b
...
@@ -78,8 +78,9 @@ void hists__output_resort_threaded(struct hists *hists);
...
@@ -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
);
...
...
tools/perf/util/ui/helpline.h
View file @
ee8f967b
...
@@ -2,6 +2,7 @@
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment