Message ID | 20221213232651.1269909-3-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp421183wrn; Tue, 13 Dec 2022 15:30:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5EShPh1I+v7mwGHkzmuQQQPiM9huRwPSk/0o5brqYGOl+UGKrSuwiDnM6AW3dg6H2tdS6e X-Received: by 2002:a17:907:a64a:b0:7c1:64dc:ac25 with SMTP id vu10-20020a170907a64a00b007c164dcac25mr11378002ejc.23.1670974233427; Tue, 13 Dec 2022 15:30:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670974233; cv=none; d=google.com; s=arc-20160816; b=cyum9SJltZ5P0kEu93MM977yOYM8eSrxw+EkY+I5M2GSJ9MDVc/w+a2D2ls4HNEobf yDvu5wnL3MczPfjUP7KUo7+5ZQyCWUQqOT5BHz5vcn8EeZD1DHlQOJWUHMgmI7opdU/z UB7bBPbILATZjMGeCJL20PgsKL/0hyg89dlE7dCVBqE9cVPWLWFL5EURoSTsS0nqgvUM Of09xlMkCu3PkfA8/cdItvWfFEKCGJWH6AIpErUl2A9T3b2yXgRHmtAxBxRsHdTVcowz UiPptGJq0+Upp7+HtpbRe9EUdm2RNBcXtDstPPBEnRc+ZAt1a7a/wr1ER3kiD2d+flzO NhiA== 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=Nto1ePcvoNdo0gJd4FRIsAa3aTl5xw4C0we0lXrYi4o=; b=rYHmzEwJflpJm7yGymQxtY3ukkhnfvuOePxddJGbCpeUE8QlGGlc2u2Ve61YYQjn/2 07WfZyY19YSdmC3t+FHCRn+ttp89N863RMnBzb+zw2Oq/Ks/UTLLtZpziP7YslQa87m6 LtEfTS+RiRYfY9mryplavK3R8+njmJVad9WuQ8iZRGXUzX5aHHp8EK8C3oKTCTaRdSOK GNsftOwFfoG8mMeT4r2O7LKI2UaDcX93KZ2txvdaxHos9wsXFXdU+IvWkVAZ98RWptHW 8xsGcN02wtM+J9UKRmnwdcRs7BImMw2EzB0b+iyHQ3w3J4G6gqYRt6olCRwwROytttTD 98Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=oaxFlW2g; 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 i7-20020a50fc07000000b0047010e04c4dsi3607982edr.481.2022.12.13.15.30.09; Tue, 13 Dec 2022 15:30:33 -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=oaxFlW2g; 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 S237016AbiLMX1g (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Tue, 13 Dec 2022 18:27:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237050AbiLMX1Z (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 13 Dec 2022 18:27:25 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10BFD1AA1C for <linux-kernel@vger.kernel.org>; Tue, 13 Dec 2022 15:27:24 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id a5-20020a25af05000000b006e450a5e507so18865330ybh.22 for <linux-kernel@vger.kernel.org>; Tue, 13 Dec 2022 15:27:24 -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=Nto1ePcvoNdo0gJd4FRIsAa3aTl5xw4C0we0lXrYi4o=; b=oaxFlW2ge9haPbT6hCAVVmPuTox9DW+MdJNbZ0iwTokh/4XBkQYtfdusDGVsroQCBm 9cjRzTm2cTtoTugbzyCsz2kAHTjET5PTm0Qk0Vytd93WKj/92dwBthyYMEWpJ4MTqXXZ Kgspw5ZoKtAmQTgags/2mTbzHSF1im/xe5z7xwqmMxY+MpgtR2QCiepGpC+pSAjeR62r af+wkR/DSxLYLJ6v8UzQYo8yEedKseMcvnt7JbQHB+veoq0VjssEp6Vl9Tr9PuxO2F17 A3OnHm0NqQzzvD7NNSu2YgWdnWtZRBASIIw6rkBU4yPgO0G6Iw9CrmSsI4xx9udJ5Lje 3Bjg== 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=Nto1ePcvoNdo0gJd4FRIsAa3aTl5xw4C0we0lXrYi4o=; b=w/R9dBGV9L9rCXXExogH0ox5L+JbF1lxguj/gfXbQES2jsV4GxS+ZkO5q8yCuYis0/ KduJcKnFOEgzK6IEcTqKeEsB3dmq9c8OIC4TJcVEV+9SYFThuljJsP/a7AoA+dkUXwqy Oh9jawDIRw0K4ySFeOHx01agWJDQt477kD0pvIRRnkaOEmiJJZnopRtQhutg7RL2dhSX m7Jd6fX7A6PhWKAuar7TpVSMR4aEax/xZuyvNMu86BeIWd2h3MVLm6Cvz8pMgFGwh2oL s7KG/lQpRm2YoPCX8ZjPgFHeoxBaeCzqtybT1KJeO1YYx4Re1aQxpjMkzM/DWU3ltvAb BVFw== X-Gm-Message-State: ANoB5pkmo90Gq9lVLZtOagV/XzLuMYo8HBdWlP/v0d6w9eBo1FmEOzM0 BGXMRFXSTo1xu/3KALeR/+9ZDADk+Rvz X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:6268:b448:f7f4:4c2]) (user=irogers job=sendgmr) by 2002:a5b:f42:0:b0:6fd:e4ef:5b1d with SMTP id y2-20020a5b0f42000000b006fde4ef5b1dmr25692919ybr.99.1670974043252; Tue, 13 Dec 2022 15:27:23 -0800 (PST) Date: Tue, 13 Dec 2022 15:26:48 -0800 In-Reply-To: <20221213232651.1269909-1-irogers@google.com> Message-Id: <20221213232651.1269909-3-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 2/5] perf trace-event: Add libtraceevent version tools to header 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> Content-Type: text/plain; charset="UTF-8" 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752143477505643934?= X-GMAIL-MSGID: =?utf-8?q?1752143477505643934?= |
Series |
build/libtraceevent resends
|
|
Commit Message
Ian Rogers
Dec. 13, 2022, 11:26 p.m. UTC
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;