Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03fba21a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

User visible fixes:

  - Fix showing the running kernel build id using: (Michael Petlan)

      $ perf buildid-list -k
      03c2a89c595616188f02f0282762a75b47069bc0

  - hists browser (report, top) symbol filter segfault fixes (Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 4e93ad60 4938cf0c

tools/perf/builtin-buildid-list.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

+8 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,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
@@ -928,6 +931,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);
@@ -1033,6 +1038,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);

tools/perf/util/build-id.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ int build_id__sprintf(const u8 *build_id, int len, char *bf) 
		bid += 2;

		bid += 2;

	}

	}





	return raw - build_id;

	return (bid - bf) + 1;

}

}





int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)

int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)