Commit 5492e725 authored by Yang Jihong's avatar Yang Jihong Committed by Namhyung Kim
Browse files

perf tools: Extend PRINT_ATTRf to support printing of members with a value of 0 



When printing attr, members whose value is 0 will not be printed, we want
to print the case where attr->type is 0(PERF_TYPE_HARDWARE), add `_a`
param to PRINT_ATTRf macro to always print member when it is true
No functional change.

Signed-off-by: default avatarYang Jihong <yangjihong1@huawei.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: anshuman.khandual@arm.com
Cc: mark.rutland@arm.com
Cc: irogers@google.com
Cc: jesussanp@google.com
Cc: peterz@infradead.org
Cc: acme@kernel.org
Cc: jolsa@kernel.org
Cc: alexander.shishkin@linux.intel.com
Cc: mingo@redhat.com
Link: https://lore.kernel.org/r/20230623054416.160858-3-yangjihong1@huawei.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 220f88b5

tools/perf/util/perf_event_attr_fprintf.c

+7 −7
Original line number Diff line number Diff line
@@ -80,15 +80,15 @@ static void __p_read_format(char *buf, size_t size, u64 value) 
#define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, val)

#define p_read_format(val)	__p_read_format(buf, BUF_SIZE, val)



#define PRINT_ATTRn(_n, _f, _p)				\

#define PRINT_ATTRn(_n, _f, _p, _a)			\

do {							\

	if (attr->_f) {					\

	if (_a || attr->_f) {				\

		_p(attr->_f);				\

		ret += attr__fprintf(fp, _n, buf, priv);\

	}						\

} while (0)



#define PRINT_ATTRf(_f, _p)	PRINT_ATTRn(#_f, _f, _p)

#define PRINT_ATTRf(_f, _p)	PRINT_ATTRn(#_f, _f, _p, false)



int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,

			     attr__fprintf_f attr__fprintf, void *priv)
@@ -99,7 +99,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, 
	PRINT_ATTRf(type, p_unsigned);

	PRINT_ATTRf(size, p_unsigned);

	PRINT_ATTRf(config, p_hex);

	PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned);

	PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned, false);

	PRINT_ATTRf(sample_type, p_sample_type);

	PRINT_ATTRf(read_format, p_read_format);
@@ -141,10 +141,10 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, 
	PRINT_ATTRf(remove_on_exec, p_unsigned);

	PRINT_ATTRf(sigtrap, p_unsigned);



	PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned);

	PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned, false);

	PRINT_ATTRf(bp_type, p_unsigned);

	PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex);

	PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex);

	PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex, false);

	PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex, false);

	PRINT_ATTRf(branch_sample_type, p_branch_sample_type);

	PRINT_ATTRf(sample_regs_user, p_hex);

	PRINT_ATTRf(sample_stack_user, p_unsigned);