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

Commit 30d81553 authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf diff: Check if all data files with branch stacks 



We will expand perf diff to support diff cycles of individual programs
blocks, so it requires all data files having branch stacks.

This patch checks HEADER_BRANCH_STACK in header, and only set the flag
has_br_stack when HEADER_BRANCH_STACK are set in all data files.

 v2:
 ---
 Move check_file_brstack() from __cmd_diff() to cmd_diff().
 Because later patch will check flag 'has_br_stack' before
 ui_init().

Signed-off-by: default avatarJin Yao <yao.jin@linux.intel.com>
Reviewed-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1561713784-30533-4-git-send-email-yao.jin@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fe96245c

tools/perf/builtin-diff.c

+29 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct perf_diff { 
	struct perf_time_interval	*ptime_range;

	int				 range_size;

	int				 range_num;

	bool				 has_br_stack;

};



/* Diff command specific HPP columns. */
@@ -873,6 +874,31 @@ static int parse_time_str(struct data__file *d, char *abstime_ostr, 
	return ret;

}



static int check_file_brstack(void)

{

	struct data__file *d;

	bool has_br_stack;

	int i;



	data__for_each_file(i, d) {

		d->session = perf_session__new(&d->data, false, &pdiff.tool);

		if (!d->session) {

			pr_err("Failed to open %s\n", d->data.path);

			return -1;

		}



		has_br_stack = perf_header__has_feat(&d->session->header,

						     HEADER_BRANCH_STACK);

		perf_session__delete(d->session);

		if (!has_br_stack)

			return 0;

	}



	/* Set only all files having branch stacks */

	pdiff.has_br_stack = true;

	return 0;

}



static int __cmd_diff(void)

{

	struct data__file *d;
@@ -1487,6 +1513,9 @@ int cmd_diff(int argc, const char **argv) 
	if (data_init(argc, argv) < 0)

		return -1;



	if (check_file_brstack() < 0)

		return -1;



	if (ui_init() < 0)

		return -1;