From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Andi Kleen <ak@linux.intel.com>,
James Clark <james.clark@arm.com>,
Sandipan Das <sandipan.das@amd.com>,
German Gomez <german.gomez@arm.com>, Leo Yan <leo.yan@linaro.org>,
Timothy Hayes <timothy.hayes@arm.com>,
Kan Liang <kan.liang@linux.intel.com>,
Xing Zhengjun <zhengjun.xing@linux.intel.com>,
Kim Phillips <kim.phillips@amd.com>,
Riccardo Mancini <rickyman7@gmail.com>,
Sean Christopherson <seanjc@google.com>,
shaomin Deng <dengshaomin@cdjrlc.com>,
Eelco Chaudron <echaudro@redhat.com>,
Athira Jajeev <atrajeev@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
bpf@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH v1 2/5] perf trace-event: Add libtraceevent version tools to header
Date: Tue, 13 Dec 2022 15:26:48 -0800 [thread overview]
Message-ID: <20221213232651.1269909-3-irogers@google.com> (raw)
In-Reply-To: <20221213232651.1269909-1-irogers@google.com>
Allow comparisons like:
\#if MAKE_LIBTRACEEVENT_VERSION(1, 3, 0) <= LIBTRACEEVENT_VERSION
Based on previously reverted:
https://lore.kernel.org/linux-perf-users/20210923001024.550263-4-irogers@google.com/
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/trace-event.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index add6c5d9531c..1fbf4c3f8809 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -6,6 +6,19 @@
#include <stdio.h>
#include <linux/types.h>
+#ifdef HAVE_LIBTRACEEVENT
+#include <traceevent/event-parse.h>
+#endif
+
+#define MAKE_LIBTRACEEVENT_VERSION(a, b, c) ((a)*255*255+(b)*255+(c))
+#ifndef LIBTRACEEVENT_VERSION
+/*
+ * If LIBTRACEEVENT_VERSION wasn't computed then set to version 1.1.0 that
+ * previously shipped with the Linux kernel tools.
+ */
+#define LIBTRACEEVENT_VERSION MAKE_LIBTRACEEVENT_VERSION(1, 1, 0)
+#endif
+
struct evlist;
struct machine;
struct perf_sample;
--
2.39.0.314.g84b9a713c41-goog
next prev parent reply other threads:[~2022-12-13 23:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 23:26 [PATCH v1 0/5] build/libtraceevent resends Ian Rogers
2022-12-13 23:26 ` [PATCH v1 1/5] perf build: Fix python/perf.so library's name Ian Rogers
2022-12-13 23:26 ` Ian Rogers [this message]
2022-12-13 23:26 ` [PATCH v1 3/5] libtraceevent: Increase libtraceevent logging when verbose Ian Rogers
2022-12-13 23:26 ` [PATCH v1 4/5] perf trace-event: Use version check to avoid 1 define Ian Rogers
2022-12-13 23:26 ` [PATCH v1 5/5] perf evlist: Remove group option Ian Rogers
2022-12-14 14:22 ` [PATCH v1 0/5] build/libtraceevent resends Arnaldo Carvalho de Melo
2022-12-14 18:00 ` Arnaldo Carvalho de Melo
2022-12-14 18:10 ` Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221213232651.1269909-3-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=anshuman.khandual@arm.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=dengshaomin@cdjrlc.com \
--cc=echaudro@redhat.com \
--cc=eranian@google.com \
--cc=german.gomez@arm.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kim.phillips@amd.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rickyman7@gmail.com \
--cc=sandipan.das@amd.com \
--cc=seanjc@google.com \
--cc=timothy.hayes@arm.com \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).