Commit f3d0a551 authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

perf c2c: Refactor node display 



The macro DISPLAY_HITM() is used to calculate HITM percentage introduced
by every node and it's shown for the node info.

This patch introduces the static function display_metrics() to replace
the macro, and the parameters are refined for passing the metric's
statistic and sum value.

Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Joe Perches <joe@perches.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210114154646.209024-6-leo.yan@linaro.org


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

tools/perf/builtin-c2c.c

+20 −13
Original line number Diff line number Diff line
@@ -1048,6 +1048,19 @@ empty_cmp(struct perf_hpp_fmt *fmt __maybe_unused, 
	return 0;

}



static int display_metrics(struct perf_hpp *hpp, u32 val, u32 sum)

{

	int ret;



	if (sum != 0)

		ret = scnprintf(hpp->buf, hpp->size, "%5.1f%% ",

				percent(val, sum));

	else

		ret = scnprintf(hpp->buf, hpp->size, "%6s ", "n/a");



	return ret;

}



static int

node_entry(struct perf_hpp_fmt *fmt __maybe_unused, struct perf_hpp *hpp,

	   struct hist_entry *he)
@@ -1091,29 +1104,23 @@ node_entry(struct perf_hpp_fmt *fmt __maybe_unused, struct perf_hpp *hpp, 
			ret = scnprintf(hpp->buf, hpp->size, "%2d{%2d ", node, num);

			advance_hpp(hpp, ret);



		#define DISPLAY_HITM(__h)						\

			if (c2c_he->stats.__h> 0) {					\

				ret = scnprintf(hpp->buf, hpp->size, "%5.1f%% ",	\

						percent(stats->__h, c2c_he->stats.__h));\

			} else {							\

				ret = scnprintf(hpp->buf, hpp->size, "%6s ", "n/a");	\

			}



			switch (c2c.display) {

			case DISPLAY_RMT:

				DISPLAY_HITM(rmt_hitm);

				ret = display_metrics(hpp, stats->rmt_hitm,

						      c2c_he->stats.rmt_hitm);

				break;

			case DISPLAY_LCL:

				DISPLAY_HITM(lcl_hitm);

				ret = display_metrics(hpp, stats->lcl_hitm,

						      c2c_he->stats.lcl_hitm);

				break;

			case DISPLAY_TOT:

				DISPLAY_HITM(tot_hitm);

				ret = display_metrics(hpp, stats->tot_hitm,

						      c2c_he->stats.tot_hitm);

				break;

			default:

				break;

			}



		#undef DISPLAY_HITM



			advance_hpp(hpp, ret);



			if (c2c_he->stats.store > 0) {