Commit 800c93ff authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf trace-event: Always build trace-event-info.c 



trace-event-info.c has no libtraceevent dependencies, always build it
and use it in builtin-record and perf_event_attr printing.

Reviewed-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dominique Martinet <asmadeus@codewreck.org>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Paran Lee <p4ranlee@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: Yang Jihong <yangjihong@bytedance.com>
Cc: Yang Li <yang.lee@linux.alibaba.com>
Cc: Ze Gao <zegao2021@gmail.com>
Cc: Zixian Cai <fzczx123@gmail.com>
Cc: zhaimingbing <zhaimingbing@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20241118225345.889810-5-irogers@google.com


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

tools/perf/builtin-record.c

+0 −2
Original line number Diff line number Diff line
@@ -1748,10 +1748,8 @@ static void record__init_features(struct record *rec) 
	if (rec->no_buildid)

		perf_header__clear_feat(&session->header, HEADER_BUILD_ID);



#ifdef HAVE_LIBTRACEEVENT

	if (!have_tracepoints(&rec->evlist->core.entries))

		perf_header__clear_feat(&session->header, HEADER_TRACING_DATA);

#endif



	if (!rec->opts.branch_stack)

		perf_header__clear_feat(&session->header, HEADER_BRANCH_STACK);

tools/perf/util/Build

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ perf-util-y += pmu-bison.o 
perf-util-y += hwmon_pmu.o

perf-util-y += tool_pmu.o

perf-util-y += svghelper.o

perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event-info.o

perf-util-y += trace-event-info.o

perf-util-y += trace-event-scripting.o

perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event.o

perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event-parse.o

tools/perf/util/perf_event_attr_fprintf.c

+0 −4
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ static void __p_config_hw_cache_id(char *buf, size_t size, u64 value) 
	}

}



#ifdef HAVE_LIBTRACEEVENT

static void __p_config_tracepoint_id(char *buf, size_t size, u64 value)

{

	char *str = tracepoint_id_to_name(value);
@@ -220,7 +219,6 @@ static void __p_config_tracepoint_id(char *buf, size_t size, u64 value) 
	print_id_hex(str);

	free(str);

}

#endif



static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type, u64 value)

{
@@ -238,9 +236,7 @@ static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type 
	case PERF_TYPE_HW_CACHE:

		return __p_config_hw_cache_id(buf, size, value);

	case PERF_TYPE_TRACEPOINT:

#ifdef HAVE_LIBTRACEEVENT

		return __p_config_tracepoint_id(buf, size, value);

#endif

	case PERF_TYPE_RAW:

	case PERF_TYPE_BREAKPOINT:

	default: