Skip to content

Commit

Permalink
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Ingo Molnar committed Dec 8, 2015
2 parents 803ca41 + 03fba21 commit a30c99a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/perf/builtin-buildid-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int cmd_buildid_list(int argc, const char **argv,
setup_pager();

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);
}
8 changes: 8 additions & 0 deletions tools/perf/ui/browsers/hists.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
bool has_children;

if (!he || !ms)
return false;

if (ms == &he->ms)
has_children = hist_entry__toggle_fold(he);
else
Expand Down Expand Up @@ -1189,6 +1192,8 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)
}

ui_browser__hists_init_top(browser);
hb->he_selection = NULL;
hb->selection = NULL;

for (nd = browser->top; nd; nd = rb_next(nd)) {
struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
Expand Down Expand Up @@ -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.
*/
do_offset:
if (!nd)
return;

if (offset > 0) {
do {
h = rb_entry(nd, struct hist_entry, rb_node);
Expand Down

0 comments on commit a30c99a

Please sign in to comment.