Commit 1634bad3 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf trace: Reduce #ifdefs for TEP_FIELD_IS_RELATIVE 



Add a helper function that applies the mask to test, or returns false
if libtraceevent is too old or not present.

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: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Eelco Chaudron <echaudro@redhat.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20230111070641.1728726-2-irogers@google.com


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

tools/perf/builtin-trace.c

+1 −3
Original line number Diff line number Diff line
@@ -2731,10 +2731,8 @@ static size_t trace__fprintf_tp_fields(struct trace *trace, struct evsel *evsel, 
				offset = format_field__intval(field, sample, evsel->needs_swap);

				syscall_arg.len = offset >> 16;

				offset &= 0xffff;

#if LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)

				if (field->flags & TEP_FIELD_IS_RELATIVE)

				if (tep_field_is_relative(field->flags))

					offset += field->offset + field->size;

#endif

			}



			val = (uintptr_t)(sample->raw_data + offset);

tools/perf/util/data-convert-bt.c

+1 −3
Original line number Diff line number Diff line
@@ -322,10 +322,8 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, 
		offset = tmp_val;

		len = offset >> 16;

		offset &= 0xffff;

#if LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)

		if (flags & TEP_FIELD_IS_RELATIVE)

		if (tep_field_is_relative(flags))

			offset += fmtf->offset + fmtf->size;

#endif

	}



	if (flags & TEP_FIELD_IS_ARRAY) {

tools/perf/util/evsel.c

+1 −3
Original line number Diff line number Diff line
@@ -2784,10 +2784,8 @@ void *evsel__rawptr(struct evsel *evsel, struct perf_sample *sample, const char 
	if (field->flags & TEP_FIELD_IS_DYNAMIC) {

		offset = *(int *)(sample->raw_data + field->offset);

		offset &= 0xffff;

#if LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)

		if (field->flags & TEP_FIELD_IS_RELATIVE)

		if (tep_field_is_relative(field->flags))

			offset += field->offset + field->size;

#endif

	}



	return sample->raw_data + offset;

tools/perf/util/python.c

+1 −3
Original line number Diff line number Diff line
@@ -442,10 +442,8 @@ tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field) 
			offset  = val;

			len     = offset >> 16;

			offset &= 0xffff;

#if LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)

			if (field->flags & TEP_FIELD_IS_RELATIVE)

			if (tep_field_is_relative(field->flags))

				offset += field->offset + field->size;

#endif

		}

		if (field->flags & TEP_FIELD_IS_STRING &&

		    is_printable_array(data + offset, len)) {

tools/perf/util/scripting-engines/trace-event-perl.c

+1 −3
Original line number Diff line number Diff line
@@ -393,10 +393,8 @@ static void perl_process_tracepoint(struct perf_sample *sample, 
			if (field->flags & TEP_FIELD_IS_DYNAMIC) {

				offset = *(int *)(data + field->offset);

				offset &= 0xffff;

#if LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)

				if (field->flags & TEP_FIELD_IS_RELATIVE)

				if (tep_field_is_relative(field->flags))

					offset += field->offset + field->size;

#endif

			} else

				offset = field->offset;

			XPUSHs(sv_2mortal(newSVpv((char *)data + offset, 0)));