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

perf diff: Use __block_info__cmp() to replace block_pair_cmp() 



'perf diff' uses block_pair_cmp() to compare two blocks. But
block_info__cmp() has the similar functionality and it's a bit more
complete.

This patch removes block_pair_cmp() and uses __block_info__cmp()
instead. __block_info__cmp() is wrapped by block_info__cmp() and it
doesn't receives a perf_hpp_fmt parameter.

Signed-off-by: default avatarJin Yao <yao.jin@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200202141655.32053-3-yao.jin@linux.intel.com


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

tools/perf/builtin-diff.c

+2 −19
Original line number Diff line number Diff line
@@ -572,29 +572,12 @@ static void init_block_hist(struct block_hist *bh) 
	bh->valid = true;

}



static int block_pair_cmp(struct hist_entry *a, struct hist_entry *b)

{

	struct block_info *bi_a = a->block_info;

	struct block_info *bi_b = b->block_info;

	int cmp;



	if (!bi_a->sym || !bi_b->sym)

		return -1;



	cmp = strcmp(bi_a->sym->name, bi_b->sym->name);



	if ((!cmp) && (bi_a->start == bi_b->start) && (bi_a->end == bi_b->end))

		return 0;



	return -1;

}



static struct hist_entry *get_block_pair(struct hist_entry *he,

					 struct hists *hists_pair)

{

	struct rb_root_cached *root = hists_pair->entries_in;

	struct rb_node *next = rb_first_cached(root);

	int cmp;

	int64_t cmp;



	while (next != NULL) {

		struct hist_entry *he_pair = rb_entry(next, struct hist_entry,
@@ -602,7 +585,7 @@ static struct hist_entry *get_block_pair(struct hist_entry *he, 


		next = rb_next(&he_pair->rb_node_in);



		cmp = block_pair_cmp(he_pair, he);

		cmp = __block_info__cmp(he_pair, he);

		if (!cmp)

			return he_pair;

	}

tools/perf/util/block-info.c

+7 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ struct block_info *block_info__new(void) 
	return bi;

}



int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,

			struct hist_entry *left, struct hist_entry *right)

int64_t __block_info__cmp(struct hist_entry *left, struct hist_entry *right)

{

	struct block_info *bi_l = left->block_info;

	struct block_info *bi_r = right->block_info;
@@ -91,6 +90,12 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused, 
	return (int64_t)(bi_r->end - bi_l->end);

}



int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,

			struct hist_entry *left, struct hist_entry *right)

{

	return __block_info__cmp(left, right);

}



static void init_block_info(struct block_info *bi, struct symbol *sym,

			    struct cyc_hist *ch, int offset,

			    u64 total_cycles)

tools/perf/util/block-info.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ static inline void __block_info__zput(struct block_info **bi) 


#define block_info__zput(bi) __block_info__zput(&bi)



int64_t __block_info__cmp(struct hist_entry *left, struct hist_entry *right);



int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,

			struct hist_entry *left, struct hist_entry *right);

CRA Git | Maintained and supported by SUSTech CRA and CCSE