From patchwork Tue Dec 13 23:26:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 32988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp421810wrn; Tue, 13 Dec 2022 15:32:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf7LNYd+CgAn4yzPxMZSDkSdeq7hOOH6CFBlHOruyEPctSYydSvij94zXKeSxCBglnYvuuTI X-Received: by 2002:a05:6402:f0b:b0:46f:fe45:ed68 with SMTP id i11-20020a0564020f0b00b0046ffe45ed68mr8016921eda.26.1670974326187; Tue, 13 Dec 2022 15:32:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670974326; cv=none; d=google.com; s=arc-20160816; b=y2vhHQQ4xba90eWboH9P0+cuvaj53peH/uj3SHYwAlJ1zWpwCJgbSG/iYxCwPHEH9a oN2mBYFgXy+lrz/pCztFxaK74LmcxW6HCjIPJAIwiYGkV4gzDMlO7Gb3Jp4NbZh1tY2d vgEgyylOlyvjSbxEzymgF2G05JvhqKq4iPdmj/4InSv3ajpG25MDSSkhgH6nulmPPH+T NBuJuyAsJX2SIu5CoeG9sUeoRFzO8Ft5RHMA0L8MAlLoKGRe+eu5FHJIvzxss8PAusdW 8l70m0R+S7hHTdumrPqY4oH7UhnK9rvMQoDgH3DAIuh9Ts4r7MLCP+uV/hX2LpCbCHgi 6tNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=72onBX7/v3Mkh3/F3ClgCmK3zR5kHyTFpk5uwdtwCSs=; b=FgBC/rD6PFehxD+HeDPxtBhQX6cPBKHm8hBbFzXXVxu0EL8RIkcjGeHhfy0HhhDJSM w4lDom7NsrUogskVai1vL5eCQrqJoEESFSvfxR7U4dny3gQZWnwLXCNpO3xnRWDlE4Fg LvP0/7wUdwJjlh8r31FhabaaMRTUrhY9os01Fe/NRPcheky6G+kiGvnU5gwJ8zoXylRF JMBxenUyI7UvcfAlIt3S/PdjD2qjh60GQPERMUrVokkMdxrEz+uKzc1aiAdjXbUGkzMn 4+9O7k5HRHFFZ+RlmwG2/RqM1dA16OoHZlD5K7h4QeB5kTDXMODvijMKc8cO3fr+TLuV UKDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="T/Fv+q4w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z36-20020a509e27000000b0046c38a4d141si9052748ede.100.2022.12.13.15.31.40; Tue, 13 Dec 2022 15:32:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="T/Fv+q4w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237107AbiLMX2K (ORCPT + 99 others); Tue, 13 Dec 2022 18:28:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237094AbiLMX1o (ORCPT ); Tue, 13 Dec 2022 18:27:44 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF3FE1009 for ; Tue, 13 Dec 2022 15:27:39 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3b4eb124be5so187466697b3.19 for ; Tue, 13 Dec 2022 15:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=72onBX7/v3Mkh3/F3ClgCmK3zR5kHyTFpk5uwdtwCSs=; b=T/Fv+q4wWPE3/uQotDdRijKFH3wyVwQbQ6gc3o+vcrxcGxHU3t678lqjpd5hs2LAm1 x0WiDtolBdP9LLUfuShpATfqnEM94gWbBXa1GmMyuT8d3lyAz/XUjWRfuk9UDQJGWFJp CUgd8NywSesnjHsYKs9Z65pnqjEbDYgfgUWchjy/cUREjNsxMwwVCzR/SYJLIzw896hf nFXYYMdtkAJ0Yh8KfQBTZpXWI6ldCqpSDI2nY1kztBwuG8Bvg+cPgFOi0p+ba8eADjM6 Gvhb3Ho2ZAHZ5Z9qTC73tqXlombRlG5MIm+fUTNKbEhSc6QgcgebKoPsHl7IVhnx1uHE Isyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=72onBX7/v3Mkh3/F3ClgCmK3zR5kHyTFpk5uwdtwCSs=; b=HMo25YOFkjVgJfajFHwJP3taeGlYPF5D9wII2O8z24jsVUkka1FtM9IoXhoz0a8FhC 3nmmgAKs5kJxOUjurCSEmcopLXxY9ulvNjxiDx7UGagwZ9ECsqKWHyRLIrkAQ8RrbKC1 mTGN8B2pFsTPFNEuhgjn2MDMIFipXcml1unPpcJUocZDqbS3CV+fG3h9bI0Wqr7uoc1/ pReK89xl23oPy68tKfir444wgt44krleDa4T3KtbFufxZNAgKqtGvqACh5u4S2WzDf+m +vZpfY/FFPHHpf1UfuhvRcPfVjLJcxeipr8QxK3nRZb99zgc2UEi+nBopMR1JVAoZf3V E+mg== X-Gm-Message-State: ANoB5pkSjr5mJK6DapQB56yh37Ds2e5yaCQfumkh5BZReFBFkgDxmHzF io0rXeXGfcTs8K95AngJPTKYDbLEwkHK X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:6268:b448:f7f4:4c2]) (user=irogers job=sendgmr) by 2002:a81:8343:0:b0:36f:d5d4:7e0c with SMTP id t64-20020a818343000000b0036fd5d47e0cmr27799444ywf.122.1670974059011; Tue, 13 Dec 2022 15:27:39 -0800 (PST) Date: Tue, 13 Dec 2022 15:26:50 -0800 In-Reply-To: <20221213232651.1269909-1-irogers@google.com> Message-Id: <20221213232651.1269909-5-irogers@google.com> Mime-Version: 1.0 References: <20221213232651.1269909-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v1 4/5] perf trace-event: Use version check to avoid 1 define From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Alexey Bayduraev , Adrian Hunter , Anshuman Khandual , Andi Kleen , James Clark , Sandipan Das , German Gomez , Leo Yan , Timothy Hayes , Kan Liang , Xing Zhengjun , Kim Phillips , Riccardo Mancini , Sean Christopherson , shaomin Deng , Eelco Chaudron , Athira Jajeev , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Cc: Stephane Eranian , Ian Rogers X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752143574921006788?= X-GMAIL-MSGID: =?utf-8?q?1752143574921006788?= Remove HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE by using a version check against 1.5.0. Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 4 ---- tools/perf/builtin-trace.c | 2 +- tools/perf/util/data-convert-bt.c | 3 ++- tools/perf/util/evsel.c | 2 +- tools/perf/util/python.c | 2 +- tools/perf/util/scripting-engines/trace-event-perl.c | 2 +- tools/perf/util/scripting-engines/trace-event-python.c | 2 +- tools/perf/util/sort.c | 3 ++- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 83ed969b95b4..9a71d8659efc 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -1199,10 +1199,6 @@ ifneq ($(NO_LIBTRACEEVENT),1) LIBTRACEEVENT_VERSION_CPP := $(shell expr $(LIBTRACEEVENT_VERSION_1) \* 255 \* 255 + $(LIBTRACEEVENT_VERSION_2) \* 255 + $(LIBTRACEEVENT_VERSION_3)) CFLAGS += -DLIBTRACEEVENT_VERSION=$(LIBTRACEEVENT_VERSION_CPP) $(call detected,CONFIG_LIBTRACEEVENT) - LIBTRACEEVENT_VERSION_WITH_TEP_FIELD_IS_RELATIVE := $(shell expr 1 \* 255 \* 255 + 5 \* 255 + 0) # 1.5.0 - ifeq ($(shell test $(LIBTRACEEVENT_VERSION_CPP) -gt $(LIBTRACEEVENT_VERSION_WITH_TEP_FIELD_IS_RELATIVE); echo $$?),0) - CFLAGS += -DHAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE - endif else dummy := $(warning Warning: libtraceevent is missing limiting functionality, please install libtraceevent-dev/libtraceevent-devel) endif diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index c9802ab549d7..2c8a213e0bc3 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2729,7 +2729,7 @@ 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; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (field->flags & TEP_FIELD_IS_RELATIVE) offset += field->offset + field->size; #endif diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c index b842273458b8..7ec0d13fb470 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -36,6 +36,7 @@ #include "util/sample.h" #ifdef HAVE_LIBTRACEEVENT +#include "util/trace-event.h" #include #endif @@ -322,7 +323,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, offset = tmp_val; len = offset >> 16; offset &= 0xffff; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (flags & TEP_FIELD_IS_RELATIVE) offset += fmtf->offset + fmtf->size; #endif diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 77b2cf5a214e..6e623d5541e9 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2784,7 +2784,7 @@ 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; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (field->flags & TEP_FIELD_IS_RELATIVE) offset += field->offset + field->size; #endif diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 7320f7f777fe..1d0cf72506a6 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -442,7 +442,7 @@ tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field) offset = val; len = offset >> 16; offset &= 0xffff; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (field->flags & TEP_FIELD_IS_RELATIVE) offset += field->offset + field->size; #endif diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index c097b7934fd4..1062629d13c2 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c @@ -393,7 +393,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, if (field->flags & TEP_FIELD_IS_DYNAMIC) { offset = *(int *)(data + field->offset); offset &= 0xffff; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (field->flags & TEP_FIELD_IS_RELATIVE) offset += field->offset + field->size; #endif diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index e930f5f1f36d..e294a13c399d 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -994,7 +994,7 @@ static void python_process_tracepoint(struct perf_sample *sample, offset = val; len = offset >> 16; offset &= 0xffff; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (field->flags & TEP_FIELD_IS_RELATIVE) offset += field->offset + field->size; #endif diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 0ecc2cb13792..b929cc5eb8cf 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -32,6 +32,7 @@ #include #ifdef HAVE_LIBTRACEEVENT +#include "trace-event.h" #include #endif @@ -2568,7 +2569,7 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, tep_read_number_field(field, a->raw_data, &dyn); offset = dyn & 0xffff; size = (dyn >> 16) & 0xffff; -#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE +#if MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) <= LIBTRACEEVENT_VERSION if (field->flags & TEP_FIELD_IS_RELATIVE) offset += field->offset + field->size; #endif