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
nexedi
linux
Commits
a30c99a0
Commit
a30c99a0
authored
Dec 08, 2015
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by:
Ingo Molnar
<
mingo@kernel.org
>
parents
803ca418
03fba21a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
tools/perf/builtin-buildid-list.c
tools/perf/builtin-buildid-list.c
+1
-1
tools/perf/ui/browsers/hists.c
tools/perf/ui/browsers/hists.c
+8
-0
No files found.
tools/perf/builtin-buildid-list.c
View file @
a30c99a0
...
@@ -110,7 +110,7 @@ int cmd_buildid_list(int argc, const char **argv,
...
@@ -110,7 +110,7 @@ int cmd_buildid_list(int argc, const char **argv,
setup_pager
();
setup_pager
();
if
(
show_kernel
)
if
(
show_kernel
)
return
sysfs__fprintf_build_id
(
stdout
);
return
!
(
sysfs__fprintf_build_id
(
stdout
)
>
0
);
return
perf_session__list_build_ids
(
force
,
with_hits
);
return
perf_session__list_build_ids
(
force
,
with_hits
);
}
}
tools/perf/ui/browsers/hists.c
View file @
a30c99a0
...
@@ -340,6 +340,9 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser)
...
@@ -340,6 +340,9 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser)
struct
callchain_list
*
cl
=
container_of
(
ms
,
struct
callchain_list
,
ms
);
struct
callchain_list
*
cl
=
container_of
(
ms
,
struct
callchain_list
,
ms
);
bool
has_children
;
bool
has_children
;
if
(
!
he
||
!
ms
)
return
false
;
if
(
ms
==
&
he
->
ms
)
if
(
ms
==
&
he
->
ms
)
has_children
=
hist_entry__toggle_fold
(
he
);
has_children
=
hist_entry__toggle_fold
(
he
);
else
else
...
@@ -1189,6 +1192,8 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)
...
@@ -1189,6 +1192,8 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)
}
}
ui_browser__hists_init_top
(
browser
);
ui_browser__hists_init_top
(
browser
);
hb
->
he_selection
=
NULL
;
hb
->
selection
=
NULL
;
for
(
nd
=
browser
->
top
;
nd
;
nd
=
rb_next
(
nd
))
{
for
(
nd
=
browser
->
top
;
nd
;
nd
=
rb_next
(
nd
))
{
struct
hist_entry
*
h
=
rb_entry
(
nd
,
struct
hist_entry
,
rb_node
);
struct
hist_entry
*
h
=
rb_entry
(
nd
,
struct
hist_entry
,
rb_node
);
...
@@ -1294,6 +1299,9 @@ static void ui_browser__hists_seek(struct ui_browser *browser,
...
@@ -1294,6 +1299,9 @@ static void ui_browser__hists_seek(struct ui_browser *browser,
* and stop when we printed enough lines to fill the screen.
* and stop when we printed enough lines to fill the screen.
*/
*/
do_offset:
do_offset:
if
(
!
nd
)
return
;
if
(
offset
>
0
)
{
if
(
offset
>
0
)
{
do
{
do
{
h
=
rb_entry
(
nd
,
struct
hist_entry
,
rb_node
);
h
=
rb_entry
(
nd
,
struct
hist_entry
,
rb_node
);
...
...
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