From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06E4E21643E for ; Tue, 5 Nov 2024 21:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730842029; cv=none; b=g0tohTpbe7zRAGx8X1ID20ONuzQQF4Gme8OJEf2vhBVd1uxg/rNGxyUQERU9j8cg66xNzzu5UC1YORVmVlTuVBjhk3ugi/7zb3wWod8YWFhkxs1mmG/QPnL+4bv+Ct/WNcW4novwvgk2x7PPhki4FIdeXTlF+p4xPbIBMQokBkQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730842029; c=relaxed/simple; bh=fw5FTiisDk5cyhf8wcogBBpQyMSz0nXrYiG3JWj7IaI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=SXzMBzJk+SHVcX07bQn1QLbDvSCeuBSre78792ILQSZyD9W43RlHVueywv2/fySuQcGLz0AfL9WV56NUeYLlHNh+GSvrZjv0K+PgE+PqdaRlNufslkUbwd7KrNTjk2EOWcHdUHi7Pn/1fPQfnkR736HfXg9auNFtYUoJ1MlaQls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Q5nwL+nK; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Q5nwL+nK" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e02fff66a83so9346832276.0 for ; Tue, 05 Nov 2024 13:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730842026; x=1731446826; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=QCWMpv5edYfDnb5d8WWLsWf6rYHjMo4DKAX+NrFH0Vo=; b=Q5nwL+nKC4aChy7+kotvKLU9PuHStTcrtgn2M0YLZnPsyX7+ntetXyVWbl9Fe5H75N Me6Hcwl/8MES5fZ/Ja6GQY/mHUX2+QO+zv5fso4NTPNXEdpGyoahEbFo39zK+K/irfsO ZXgY2kU112OVu0aOgknwPupNu5Hpf7P/9aoxpTvfUixUJAwcdSSGMXslY4ZklmhRYUfW x0ZJebOoSBX/0cmmEALggZOEmR6IwN0HqaQoQ0+allq46tfaX8xw+K0lBbLDRQa58gls HoUJvCtdi750PBmfxr07qOVYFj68fEdY3mamolOBGZ23nwaGcSt1SmdUCdRxWVTUet7+ Bd2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730842026; x=1731446826; h=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=QCWMpv5edYfDnb5d8WWLsWf6rYHjMo4DKAX+NrFH0Vo=; b=oPV9yZWXLsI4xKWMSjLKDuxeuIqMk2xJGpedhcFwGuWAibcmGTeAicJiiWufEb4E6i TqtKSgu12X3g0mywxXT7SwqmYnLaFRRS9RrMhQesOsHMjsAbE4K8BRUBTNO1Zriyd+Ex Kgo7AEcQhb8bjKNyf7xUDBdnZIzFCQ0pJZyi7gePW6vAFMFtID901qHPd0wniNZaRZv1 L6meUBi5n6vHXr3Bnp309dFZkRujfmssT17fhDbNdCIusf/8C4k+/k1TAGGtUxGAXGOn DOmyMh5wsvLD52K0zm28c6pxlHv2+ER/fsGc/4bo4NycTqCfgYlH+2E0xARHe7Lw4Af+ ZqVQ== X-Forwarded-Encrypted: i=1; AJvYcCXD0hqkEZR21fGeH7x2+HaY2iLiDvrTz2f7/5u5dsxfPPjl9xM+s7Tnf+LRt9/+sNS02GKngvz3oE+nrPv+imJ5@vger.kernel.org X-Gm-Message-State: AOJu0YxksNEXoTr15u/sQNVKmT6m7Bwtol9W4Hhgs2SXdiTJ7sBHmCDz hv30kflQK549D0x6SXIxpJOipm+ib0Xmv2F3g+c+UmkXOFknSf/MmmDMPmq1EZz3qTHJUtdlsEe 7Ln9/Zg== X-Google-Smtp-Source: AGHT+IGQnG3PzotYn3w5dRLN75V53FPNsdkX1P6AsVE1rPf1lD2zR9HPjWOt2zF3Rm8ZEU/FfDMAT4bvTT97 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:ff9e:ab12:75ac:c1a0]) (user=irogers job=sendgmr) by 2002:a25:acc9:0:b0:e28:eae7:f838 with SMTP id 3f1490d57ef6-e30e5917b41mr16656276.0.1730842025995; Tue, 05 Nov 2024 13:27:05 -0800 (PST) Date: Tue, 5 Nov 2024 13:26:49 -0800 In-Reply-To: <20241105212652.401943-1-irogers@google.com> Message-Id: <20241105212652.401943-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241105212652.401943-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v3 3/6] perf trace-event: Always build trace-event-info.c From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Type: text/plain; charset="UTF-8" trace-event-info.c has no libtraceevent depdendencies, always build it and use it in builtin-record and perf_event_attr printing. Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 2 -- tools/perf/util/Build | 2 +- tools/perf/util/perf_event_attr_fprintf.c | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f83252472921..0b637cea4850 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -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); diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 1eedead5f2f2..609c69995c51 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -85,7 +85,7 @@ perf-util-y += pmu-flex.o perf-util-y += pmu-bison.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 diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c index 59fbbba79697..a73c74b99a3b 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -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: -- 2.47.0.199.ga7371fff76-goog