From nobody Mon Feb 9 07:22:20 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F8FBC761A6 for ; Tue, 28 Mar 2023 01:41:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbjC1BlX (ORCPT ); Mon, 27 Mar 2023 21:41:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbjC1BlU (ORCPT ); Mon, 27 Mar 2023 21:41:20 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4DE826B2 for ; Mon, 27 Mar 2023 18:41:19 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5425c04765dso104517127b3.0 for ; Mon, 27 Mar 2023 18:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679967679; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=GqR7zTtQQ91G+i7rdFae6kUQGU5KFoZk0zOPgnQCq6I=; b=B0Dfmb6o01HAanc4lrfMoiaVNxqL0S2uylr1cXL/LiDQbcynQSWWeWuK52OcNkqXai QT7QsiO9SEPdgRXDloU0JIN+nKU+2TmkBNosJoA5xIs1JCiGejNGO/tZOP9bZCWmIWNG 7gXaShd/TOmMs1NSBtum/P6ZzOTj7f2GCWL52s8tOnJyLnukOtdxC+Z3GPCnDLzopeBq tCPdVCa/jwQ+mkEQrsnsJf/Iboxf4nZL6EmAphMO/Mf0oWUsk6QuG+c3S2MiieBUuWuE 25edoBOZkfXGG7hBrQ7aq+V2VnCtWtCCETyg39xV6ZD3BGmJa48J1hYow60AXVKBAQ+m LHMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679967679; 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=GqR7zTtQQ91G+i7rdFae6kUQGU5KFoZk0zOPgnQCq6I=; b=SvKxSp+o6h+7z1p2zM0BBSxQKaixDdZ6oK/q7tgtOx1aiob3SMGFMmjd8v85mqAffS p2izXH7NFrp+nikiA1d2vkYqQ0jBPA7/E81rNqLyf8efX1DneznyLjE0xWzDPTxp5Ph0 TryAPbAXtfENNn6iZ8ZVFFogRebW9D37gTVDBNl/3uwTaC14QGn3NeSYK4Bm5K9LGPWX xQtrwgHAzhstR9UgdRZs5iNf0DR0SRddR6vo1mdKLGXfeUUbdIUNf0z5MFmInraK5eWZ 3aSI9Ki+32aDL5VbeWA82rDwP4r197sdBooBwxhYis4OCwUsNVGhsM9JxnPrMicfU0j6 24tw== X-Gm-Message-State: AAQBX9d1rjripsXj6FgFwwha/GXPWlwzx2hua5p7dc6soAwRxcN+JSRS +B0cq//mxZ11Ej9V8RXE1SZ26ep/mwZ1 X-Google-Smtp-Source: AKy350ZQ0hlk2F8Saos9KfdCnbLkngJsg5ccYINLqQhqBFeKNhcn7HtzaZFNMEEOmc7mdPvGEpI8gXZ6j9EV X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a544:20a5:5228:d98f]) (user=irogers job=sendgmr) by 2002:a05:6902:110b:b0:b71:addc:e19c with SMTP id o11-20020a056902110b00b00b71addce19cmr6723016ybu.8.1679967678878; Mon, 27 Mar 2023 18:41:18 -0700 (PDT) Date: Mon, 27 Mar 2023 18:40:53 -0700 In-Reply-To: <20230328014058.870413-1-irogers@google.com> Message-Id: <20230328014058.870413-2-irogers@google.com> Mime-Version: 1.0 References: <20230328014058.870413-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 1/6] perf ui: Move window resize signal functions From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move under tools/perf/ui rather than in perf.c. This simplifies linking a main function when perf.c isn't present. Signed-off-by: Ian Rogers --- tools/perf/perf.c | 18 ------------------ tools/perf/perf.h | 2 -- tools/perf/ui/setup.c | 19 +++++++++++++++++++ tools/perf/ui/tui/setup.c | 1 - tools/perf/ui/ui.h | 3 +++ 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 82bbe0ca858b..4b1b31e78332 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -432,24 +432,6 @@ static int run_argv(int *argcp, const char ***argv) return 0; } =20 -static void pthread__block_sigwinch(void) -{ - sigset_t set; - - sigemptyset(&set); - sigaddset(&set, SIGWINCH); - pthread_sigmask(SIG_BLOCK, &set, NULL); -} - -void pthread__unblock_sigwinch(void) -{ - sigset_t set; - - sigemptyset(&set); - sigaddset(&set, SIGWINCH); - pthread_sigmask(SIG_UNBLOCK, &set, NULL); -} - static int libperf_print(enum libperf_print_level level, const char *fmt, va_list ap) { diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 74014033df60..e21a7e15a34c 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -12,8 +12,6 @@ extern const char *input_name; extern bool perf_host, perf_guest; extern const char perf_version_string[]; =20 -void pthread__unblock_sigwinch(void); - enum perf_affinity { PERF_AFFINITY_SYS =3D 0, PERF_AFFINITY_NODE, diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c index 25ded88801a3..ff800047e697 100644 --- a/tools/perf/ui/setup.c +++ b/tools/perf/ui/setup.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include =20 #include @@ -120,3 +121,21 @@ void exit_browser(bool wait_for_ok) } mutex_destroy(&ui__lock); } + +void pthread__block_sigwinch(void) +{ + sigset_t set; + + sigemptyset(&set); + sigaddset(&set, SIGWINCH); + pthread_sigmask(SIG_BLOCK, &set, NULL); +} + +void pthread__unblock_sigwinch(void) +{ + sigset_t set; + + sigemptyset(&set); + sigaddset(&set, SIGWINCH); + pthread_sigmask(SIG_UNBLOCK, &set, NULL); +} diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c index a3b8c397c24d..c1886aa184b3 100644 --- a/tools/perf/ui/tui/setup.c +++ b/tools/perf/ui/tui/setup.c @@ -9,7 +9,6 @@ #endif =20 #include "../../util/debug.h" -#include "../../perf.h" #include "../browser.h" #include "../helpline.h" #include "../ui.h" diff --git a/tools/perf/ui/ui.h b/tools/perf/ui/ui.h index 99f8d2fe9bc5..d8e911205582 100644 --- a/tools/perf/ui/ui.h +++ b/tools/perf/ui/ui.h @@ -31,4 +31,7 @@ struct option; =20 int stdio__config_color(const struct option *opt, const char *mode, int un= set); =20 +void pthread__block_sigwinch(void); +void pthread__unblock_sigwinch(void); + #endif /* _PERF_UI_H_ */ --=20 2.40.0.348.gf938b09366-goog From nobody Mon Feb 9 07:22:20 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E01C4C6FD1D for ; Tue, 28 Mar 2023 01:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232291AbjC1Blf (ORCPT ); Mon, 27 Mar 2023 21:41:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232307AbjC1Blc (ORCPT ); Mon, 27 Mar 2023 21:41:32 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C1912100 for ; Mon, 27 Mar 2023 18:41:29 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id g5-20020a25a485000000b009419f64f6afso10516595ybi.2 for ; Mon, 27 Mar 2023 18:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679967688; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=verDCOyK5Vg94wY3RYziaAnvJXO3pRUoQeewltL/GMo=; b=ndnM0GnxAOGbyZy68kGiLzbQMq4EeNAsxSUT51Bn6RMCvx2haDbE+mktB1A7n60kkf LutpwxHw8zyfU9PxO983Ja7NQcDetX6Z2aa9dt8IwGXI/HJ/9IOIu2Pvebk4pyfG815X xM0/qdH1XYOdZkC4QIeYFOVRFdSHjBVkrm7FxGI/JsU5Z971jcdx70WuEksPrOwW4mMQ u+R5U77kTBA3RtHekOgY8tlhG5HjoUmpbq4siVNJNUoekTQ2yEgcIsDWqxcr3+VaVMRl 2rR5mhMfyO7QsW304uMlWQ7pblkGURwaXaLW3G5XeMCXPOqvC/rAiRbxB/1tsEa4IJgG YdGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679967688; 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=verDCOyK5Vg94wY3RYziaAnvJXO3pRUoQeewltL/GMo=; b=gm5wedFFyLAiEkbdutnJhUJaK2N6+tPfutVYy9XJIDkF/FY4Hsf3R9Ld1r8vkAodov nx8sYknZm358+5ivZLsuTyR/+iWKdLpW6Oqk9VPQ6StNoD3IbEUUIJ6yp49WAIBRnE3z jB1lsXAfrsugX3gnrEpJb0XLSLMyR527SWJY5YvmgKYsRLi7dMkJ9YhSCdaQWntplk9e MAr/G9YJd2CnxDpuw1mVvelHkekHGoburPdMqEjLsn2uEYuq6wzwyyBLHzrSB3YJtoV1 1N0X7MI/7lWCIxqyPjxU7vjE6PE9hZaMd2kZvc0tMHm8vTF0qd2R7jvVFmO9N6lsN/TR urzg== X-Gm-Message-State: AAQBX9cPx2xGyPDDpReSO5K0ql5REc11oukXN08YMRt2ypgUdYutgknd 39IB8aHWlwlBRCa3c4HcgeLvQv9Yh71I X-Google-Smtp-Source: AKy350YwGBCHh+XFGIs5PnSfm8ziU1iAddLYb++rz17r47e/PoS0PBSTU4sb5sYQtlNpV7zfvdyxIqDVAcsK X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a544:20a5:5228:d98f]) (user=irogers job=sendgmr) by 2002:a81:ac13:0:b0:545:bade:c57e with SMTP id k19-20020a81ac13000000b00545badec57emr4179381ywh.5.1679967687965; Mon, 27 Mar 2023 18:41:27 -0700 (PDT) Date: Mon, 27 Mar 2023 18:40:54 -0700 In-Reply-To: <20230328014058.870413-1-irogers@google.com> Message-Id: <20230328014058.870413-3-irogers@google.com> Mime-Version: 1.0 References: <20230328014058.870413-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 2/6] perf usage: Move usage strings From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This simplifies linking a main function when perf.c isn't present. Signed-off-by: Ian Rogers --- tools/perf/builtin-help.c | 1 + tools/perf/builtin.h | 3 --- tools/perf/perf.c | 6 ------ tools/perf/util/usage.c | 6 ++++++ tools/perf/util/util.h | 3 +++ 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index 3976aebe3677..3e7f52054fac 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -14,6 +14,7 @@ #include #include #include "util/debug.h" +#include "util/util.h" #include #include #include diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h index d03afea86217..f2ab5bae2150 100644 --- a/tools/perf/builtin.h +++ b/tools/perf/builtin.h @@ -2,9 +2,6 @@ #ifndef BUILTIN_H #define BUILTIN_H =20 -extern const char perf_usage_string[]; -extern const char perf_more_info_string[]; - void list_common_cmds_help(void); const char *help_unknown_cmd(const char *cmd); =20 diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 4b1b31e78332..997bb9ea5ebc 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -39,12 +39,6 @@ #include #include =20 -const char perf_usage_string[] =3D - "perf [--version] [--help] [OPTIONS] COMMAND [ARGS]"; - -const char perf_more_info_string[] =3D - "See 'perf help COMMAND' for more information on a specific command."; - static int use_pager =3D -1; const char *input_name; =20 diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c index 196438ee4c9d..4c8ffbad2323 100644 --- a/tools/perf/util/usage.c +++ b/tools/perf/util/usage.c @@ -12,6 +12,12 @@ #include #include =20 +const char perf_usage_string[] =3D + "perf [--version] [--help] [OPTIONS] COMMAND [ARGS]"; + +const char perf_more_info_string[] =3D + "See 'perf help COMMAND' for more information on a specific command."; + static __noreturn void usage_builtin(const char *err) { fprintf(stderr, "\n Usage: %s\n", err); diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 1d3b300af5a1..5010abf9e01e 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -15,6 +15,9 @@ #include #endif =20 +extern const char perf_usage_string[]; +extern const char perf_more_info_string[]; + /* General helper functions */ void usage(const char *err) __noreturn; void die(const char *err, ...) __noreturn __printf(1, 2); --=20 2.40.0.348.gf938b09366-goog From nobody Mon Feb 9 07:22:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49ED7C6FD1D for ; Tue, 28 Mar 2023 01:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232301AbjC1Blw (ORCPT ); Mon, 27 Mar 2023 21:41:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230156AbjC1Blr (ORCPT ); Mon, 27 Mar 2023 21:41:47 -0400 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 DCA8D26B8 for ; Mon, 27 Mar 2023 18:41:38 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id f66-20020a255145000000b00b714602d43fso10668213ybb.10 for ; Mon, 27 Mar 2023 18:41:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679967698; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=ywXshmLmOGjaY4x40OQowm4pf0YHZ4IGihkPimWY52w=; b=JIUT89bxDoFZJcK7cHK+S1+2ScqvgAOhnR2/gdEVFiQdimTI5sLS7tYKXNHkd/wfDN azXmzSdOQUWVdrRKq3glGBbqfUTMJgp3upM7zhI9j7lGO0yxmtPoCNSSNtPQLqymSWz2 T2wdW/dChQF7lXw1j3v8C91bMlhMgC/GDR02wPIC72YMBK97oVlj8gJJ993PQY9HUZXD xBrCI0hI34wHicBN3nPn2WgbEL3cpxp/yS5uVkzuFgjxc+q8qGrDHWTiwCPoRMfcKCTR qTolJZOMbCVlErTsFP/FapOPHvTVimqClVJkpZi9q3KRgPyFuhNJ8Baa+CVrTc4xcCzD 7rPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679967698; 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=ywXshmLmOGjaY4x40OQowm4pf0YHZ4IGihkPimWY52w=; b=MYMOgOlVzJ5+I2nN9QfxNxe0fUOKwln0kmkwjwmx6KjG1gmks1j9IaP7Sh+izOr+Ck bj05qEEyB2Gl+KHFSCREEs6fxRTO2oLiRBrc9OfYCh+AFdysM/iYKJhpxG1hbhp7FAIx 7e7veQm1i2h7z6UK2QiQGbeVL5NIN2dkqhwC1jgfPUChscC/NZkyuwNR35tULVCwsOKp A4+Tk9QRSOL3Vu8AL3Wc1zWlQn85t2abzZcCvYbaK0eMF3Ss46TsVSgC/kXK6OZo6KR8 0/OiiDEZoB7cBUwNEiNdYSoXm8KxiJpPpUO1ILG1pWrg45BqMf0uZaamIR8fuPagQUiR SBGw== X-Gm-Message-State: AAQBX9d6E9IvpW7UHdigRrpLUdghauc68NAeQdAvsvTFN14CLsCvLrDB yvISfF2u5YLaoXRB8wth4kXaCQ7cozS2 X-Google-Smtp-Source: AKy350Y6n28wu/MafERlysbCqy15XbAzYFhuYCmhQpAiBUTzBQwlNMpFtw8jJBVCP+CeoUWRtORJUH377it4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a544:20a5:5228:d98f]) (user=irogers job=sendgmr) by 2002:a25:b909:0:b0:b39:b0d3:9a7f with SMTP id x9-20020a25b909000000b00b39b0d39a7fmr6562095ybj.7.1679967698066; Mon, 27 Mar 2023 18:41:38 -0700 (PDT) Date: Mon, 27 Mar 2023 18:40:55 -0700 In-Reply-To: <20230328014058.870413-1-irogers@google.com> Message-Id: <20230328014058.870413-4-irogers@google.com> Mime-Version: 1.0 References: <20230328014058.870413-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 3/6] perf header: Move perf_version_string declaration From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move to match the definition in header.c. Signed-off-by: Ian Rogers --- tools/perf/builtin-version.c | 2 +- tools/perf/perf.h | 1 - tools/perf/util/header.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c index c5d03a11e565..4a43043ca8ef 100644 --- a/tools/perf/builtin-version.c +++ b/tools/perf/builtin-version.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "builtin.h" -#include "perf.h" #include "color.h" +#include "util/header.h" #include #include #include diff --git a/tools/perf/perf.h b/tools/perf/perf.h index e21a7e15a34c..20e9b93f8a39 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -10,7 +10,6 @@ =20 extern const char *input_name; extern bool perf_host, perf_guest; -extern const char perf_version_string[]; =20 enum perf_affinity { PERF_AFFINITY_SYS =3D 0, diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index e3861ae62172..59eeb4a32ac5 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -115,6 +115,8 @@ struct perf_session; struct perf_tool; union perf_event; =20 +extern const char perf_version_string[]; + int perf_session__read_header(struct perf_session *session, int repipe_fd); int perf_session__write_header(struct perf_session *session, struct evlist *evlist, --=20 2.40.0.348.gf938b09366-goog From nobody Mon Feb 9 07:22:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEB79C76195 for ; Tue, 28 Mar 2023 01:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbjC1BmC (ORCPT ); Mon, 27 Mar 2023 21:42:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232329AbjC1Bl4 (ORCPT ); Mon, 27 Mar 2023 21:41:56 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F310E26AC for ; Mon, 27 Mar 2023 18:41:47 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id e186-20020a2537c3000000b00b72501acf50so10598960yba.20 for ; Mon, 27 Mar 2023 18:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679967707; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=2whu1qno1W8kHsCGkEHqnVJzukiPVbxiNAF9c06UxCw=; b=dzIAs3yWxD9SpgkK4CCF49PQD8Zw4LTXKF4G+QesWtXDq5wdN44G9UzTYlL7lEjRUt FcZaUmeLeh7UdjPykT4b0MCcZWMp+4dWk8y6AS0Gn61MYeW8uTdDc+9HNNM9YhCrG5k6 z6lEGiunAyGIVoM36gsdf2Yfsbz1wfwp6gQ+CxC6UQkSN/Wuo2SmJTmURn2Vq0DrDzLi Xe5yXFnEpGBnoW0+NU+2i+qZHCVlfrGiWuZwvSzM/qd8fBjvIuNs2qMLEBelBE1DxeVr Y8DyyJ5QWcOWHpDdVAlL7zpzsoX/2tPUoVDox+4rTAZBisx51TTtDUPATsagqJY4zrea w/NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679967707; 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=2whu1qno1W8kHsCGkEHqnVJzukiPVbxiNAF9c06UxCw=; b=xOKdqLY3Rcr7y+bza2m5BXiaa4wlUJWudyIPzbf7JxNUeRPJL/waryjwdCMVECZSBj KI3Ku8NBUPZBUZNHGih/cKh1KopJfTvYg4Rl+jfiYqzZzv3Z8EyNP5u7wRc8pRUCz/Xw ttgLb2G5dPTsdATgrGz0dJbLhP/PrYZTJC+5FsAUJ8HbZ5JxfNrLPRzACA6aggOt2GJa MfcGUpu1XkPPxa8jwRS8GOCFAaKZqNv41bqUKsu+P+BRNU3eRuC87+h2FZ0Wc7Q338mt SJ/2lprMW958zbmiQplO32yuvrxjE/vfuZGjhnToJXyosN/KXi0FwVnKcQYmXN56IFPk rtgw== X-Gm-Message-State: AAQBX9ctWQio4ic2jBnyzz5obugldF5wL4j1IEZVleJRB2EUcTCzb5ok ypypIu31TQ1r9Zzdnrd5DJ0su+TsQhfo X-Google-Smtp-Source: AKy350b1a/nh466GprtSUGyffhrOZ45C91uTo++lFce4psNXjIgoG3WvpR2OPr4gdCSrV/EcpF7e2bsmn/jG X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a544:20a5:5228:d98f]) (user=irogers job=sendgmr) by 2002:a05:6902:1245:b0:b77:d2db:5fa4 with SMTP id t5-20020a056902124500b00b77d2db5fa4mr8546242ybu.8.1679967707068; Mon, 27 Mar 2023 18:41:47 -0700 (PDT) Date: Mon, 27 Mar 2023 18:40:56 -0700 In-Reply-To: <20230328014058.870413-1-irogers@google.com> Message-Id: <20230328014058.870413-5-irogers@google.com> Mime-Version: 1.0 References: <20230328014058.870413-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 4/6] perf version: Use regular verbose flag From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove additional version_verbose flag by using the existing verbose variable. Signed-off-by: Ian Rogers --- tools/perf/builtin-version.c | 5 ++--- tools/perf/perf.c | 2 +- tools/perf/perf.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c index 4a43043ca8ef..1872c90a6667 100644 --- a/tools/perf/builtin-version.c +++ b/tools/perf/builtin-version.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "builtin.h" #include "color.h" +#include "util/debug.h" #include "util/header.h" #include #include @@ -8,8 +9,6 @@ #include #include =20 -int version_verbose; - struct version { bool build_options; }; @@ -92,7 +91,7 @@ int cmd_version(int argc, const char **argv) =20 printf("perf version %s\n", perf_version_string); =20 - if (version.build_options || version_verbose =3D=3D 1) + if (version.build_options || verbose > 0) library_status(); =20 return 0; diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 997bb9ea5ebc..441c354b8304 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -212,7 +212,7 @@ static int handle_options(const char ***argv, int *argc= , int *envchanged) =20 if (!strcmp(cmd, "-vv")) { (*argv)[0] =3D "version"; - version_verbose =3D 1; + verbose =3D 1; break; } =20 diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 20e9b93f8a39..989eb17ec474 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -18,5 +18,4 @@ enum perf_affinity { PERF_AFFINITY_MAX }; =20 -extern int version_verbose; #endif --=20 2.40.0.348.gf938b09366-goog From nobody Mon Feb 9 07:22:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7048C76195 for ; Tue, 28 Mar 2023 01:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232329AbjC1BmO (ORCPT ); Mon, 27 Mar 2023 21:42:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232310AbjC1BmM (ORCPT ); Mon, 27 Mar 2023 21:42:12 -0400 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 E1ABF2D59 for ; Mon, 27 Mar 2023 18:41:54 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id x15-20020a25accf000000b00b3b4535c48dso10501212ybd.7 for ; Mon, 27 Mar 2023 18:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679967714; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=5FeDRrAUdLrz0fSr31NMx6IbzsJJfSEME3Dln4iyN34=; b=p8mJ7EguZONVEmzn34c2f3NtGdtWriBX6d8Nfw1EXDkkRN+tfWGKOmTfRhXpq/OHOo lEst+nHYzm0DT1YKFL5gGLoPF3SztIRLhfNe0QosfbPN6Cg9ejo8HxNAYw1rcUYGlUjx 3C9pJnkJzcwonsu0EmVSYf9nl7MWCcg9B8zN8BjiF7fc2E4hrfXs/2dzKMNqaU2dP1jd w1ODUvIzXjTXo2z+lq3fqiOvloGiUqMAonVF0TgixAX+sYOSen1tG5hVaJNfT8idQuw0 i06TmJhd/pbp06DbWjXmf+Aa69MlGYXtmRSw2N5GdDZlUY+aoIYa7BeKjUHz4nMyh3rb bw9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679967714; 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=5FeDRrAUdLrz0fSr31NMx6IbzsJJfSEME3Dln4iyN34=; b=cLNcAHY5CygkwL4+jnHmkYNSDKGP9dn2vCb+g84Lw/iIb7LHLe42/sK0rcdnTvgP9d RwsEpSA2iuw/Ouwe7nlnv4UFPoYdTSyXLsQApEgLeP9avsbBMzesxDp7hlzGavklbySo Ntg8ce9zPKVDeMIQij7FQFO5An4Ysvh7uf/kICbIZp6KXLwO8VfLWkBnsnu74/uEOdrj ps+Pjo728IUcXj/8cmrXSZdCccq6JHnAzS29nPZyMtTfGWJ5brw6+eG1erSQM5pk3jXu NsvgBTthijgGEv3CiJg+lp04mrpd2VvNDhktOzBZFeDF3I0ngsvV5g8Afp5wZcyiXyn1 EB+A== X-Gm-Message-State: AAQBX9fRY/sHJevHvXo1uAU/QUIw0RQbhzxV6KuznXDNI7rEkEIf91O9 TBfhdlKpNwJe2L3gOuT5kVb9wg2cBVgi X-Google-Smtp-Source: AKy350bUBWSfZSFpny7sKnrBavGEInYMGwjW5CLYuolH1Zq/vpnU4LRHniBKlCuAZjAd3AFLXmJA2WiJCx1a X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a544:20a5:5228:d98f]) (user=irogers job=sendgmr) by 2002:a81:b647:0:b0:534:d71f:14e6 with SMTP id h7-20020a81b647000000b00534d71f14e6mr6018156ywk.9.1679967714150; Mon, 27 Mar 2023 18:41:54 -0700 (PDT) Date: Mon, 27 Mar 2023 18:40:57 -0700 In-Reply-To: <20230328014058.870413-1-irogers@google.com> Message-Id: <20230328014058.870413-6-irogers@google.com> Mime-Version: 1.0 References: <20230328014058.870413-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 5/6] perf util: Move input_name to util From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" input_name is the name of the input perf.data file, but having it in perf.c makes it difficult to link without perf.c. Move it to util. Signed-off-by: Ian Rogers --- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-data.c | 2 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-kwork.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/perf.c | 1 - tools/perf/perf.h | 1 - tools/perf/ui/browsers/hists.c | 2 +- tools/perf/util/util.c | 2 ++ tools/perf/util/util.h | 2 ++ 16 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 4750fac7bf93..5a93a37318cc 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -15,7 +15,6 @@ #include #include "util/symbol.h" =20 -#include "perf.h" #include "util/debug.h" =20 #include "util/evlist.h" @@ -36,6 +35,7 @@ #include "util/block-range.h" #include "util/map_symbol.h" #include "util/branch.h" +#include "util/util.h" =20 #include #include diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid= -list.c index 00bfe89f0b5d..b6816c4dd889 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -8,7 +8,6 @@ * Copyright (C) 2009, Arnaldo Carvalho de Melo */ #include "builtin.h" -#include "perf.h" #include "util/build-id.h" #include "util/debug.h" #include "util/dso.h" @@ -18,6 +17,7 @@ #include "util/session.h" #include "util/symbol.h" #include "util/data.h" +#include "util/util.h" #include #include #include diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index d3181fee4d3d..6c12f0865860 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -41,10 +41,10 @@ #include "symbol.h" #include "ui/ui.h" #include "ui/progress.h" -#include "../perf.h" #include "pmu.h" #include "pmu-hybrid.h" #include "string2.h" +#include "util/util.h" =20 struct c2c_hists { struct hists hists; diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c index b2a9a3b7f68d..ce51cbf6dc97 100644 --- a/tools/perf/builtin-data.c +++ b/tools/perf/builtin-data.c @@ -3,10 +3,10 @@ #include #include #include "builtin.h" -#include "perf.h" #include "debug.h" #include #include "data-convert.h" +#include "util/util.h" =20 typedef int (*data_cmd_fn_t)(int argc, const char **argv); =20 diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c index b1076177c37f..7117656939e7 100644 --- a/tools/perf/builtin-evlist.c +++ b/tools/perf/builtin-evlist.c @@ -7,7 +7,6 @@ =20 #include =20 -#include "perf.h" #include "util/evlist.h" #include "util/evsel.h" #include "util/evsel_fprintf.h" @@ -18,6 +17,7 @@ #include "util/debug.h" #include #include "util/tool.h" +#include "util/util.h" =20 static int process_header_feature(struct perf_session *session __maybe_unu= sed, union perf_event *event __maybe_unused) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index f3029742b800..8bc2d1775ed8 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include "builtin.h" -#include "perf.h" =20 #include "util/dso.h" #include "util/evlist.h" @@ -24,6 +23,7 @@ =20 #include "util/debug.h" #include "util/string2.h" +#include "util/util.h" =20 #include #include diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index dc59d75180d1..a9395c52b23b 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -6,7 +6,6 @@ */ =20 #include "builtin.h" -#include "perf.h" =20 #include "util/data.h" #include "util/evlist.h" @@ -20,6 +19,7 @@ #include "util/string2.h" #include "util/callchain.h" #include "util/evsel_fprintf.h" +#include "util/util.h" =20 #include #include diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index dedd612eae5e..93caf50df895 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -4,7 +4,6 @@ #include #include #include "builtin.h" -#include "perf.h" =20 #include #include "util/auxtrace.h" @@ -22,6 +21,7 @@ #include "util/pmu-hybrid.h" #include "util/sample.h" #include "util/string2.h" +#include "util/util.h" #include =20 #define MEM_OPERATION_LOAD 0x1 diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 86e18575c9be..96a0dceadeff 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include "builtin.h" -#include "perf.h" #include "perf-sys.h" =20 #include "util/cpumap.h" @@ -27,6 +26,7 @@ =20 #include "util/debug.h" #include "util/event.h" +#include "util/util.h" =20 #include #include diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 7ef565ae7265..31ac7a68a36c 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -41,7 +41,6 @@ */ =20 #include "builtin.h" -#include "perf.h" #include "util/cgroup.h" #include #include "util/parse-events.h" @@ -71,6 +70,7 @@ #include "util/bpf_counter.h" #include "util/iostat.h" #include "util/pmu-hybrid.h" +#include "util/util.h" #include "asm/bug.h" =20 #include diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index 6c629e7d370a..bce1cf896f9c 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c @@ -24,7 +24,6 @@ #include "util/thread.h" #include "util/callchain.h" =20 -#include "perf.h" #include "util/header.h" #include #include @@ -37,6 +36,7 @@ #include "util/debug.h" #include "util/string2.h" #include "util/tracepoint.h" +#include "util/util.h" #include #include =20 diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 441c354b8304..38cae4721583 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -40,7 +40,6 @@ #include =20 static int use_pager =3D -1; -const char *input_name; =20 struct cmd_struct { const char *cmd; diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 989eb17ec474..49e15e2be49e 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -8,7 +8,6 @@ #define MAX_NR_CPUS 2048 #endif =20 -extern const char *input_name; extern bool perf_host, perf_guest; =20 enum perf_affinity { diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index b72ee6822222..23d1b592ebc0 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -29,8 +29,8 @@ #include "../../util/top.h" #include "../../util/thread.h" #include "../../util/block-info.h" +#include "../../util/util.h" #include "../../arch/common.h" -#include "../../perf.h" =20 #include "../browsers/hists.h" #include "../helpline.h" diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index b356c9f7f0c3..0cdd459a319d 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -28,6 +28,8 @@ * XXX We need to find a better place for these things... */ =20 +const char *input_name; + bool perf_singlethreaded =3D true; =20 void perf_set_singlethreaded(void) diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 5010abf9e01e..8bd515b67739 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -18,6 +18,8 @@ extern const char perf_usage_string[]; extern const char perf_more_info_string[]; =20 +extern const char *input_name; + /* General helper functions */ void usage(const char *err) __noreturn; void die(const char *err, ...) __noreturn __printf(1, 2); --=20 2.40.0.348.gf938b09366-goog From nobody Mon Feb 9 07:22:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EEC5C76195 for ; Tue, 28 Mar 2023 01:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232390AbjC1Bm0 (ORCPT ); Mon, 27 Mar 2023 21:42:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232382AbjC1BmU (ORCPT ); Mon, 27 Mar 2023 21:42:20 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76E162705 for ; Mon, 27 Mar 2023 18:42:01 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id e186-20020a2537c3000000b00b72501acf50so10599481yba.20 for ; Mon, 27 Mar 2023 18:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679967721; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=kss2E4XS78XZ4HkoeCxVNy5Rmlet/VUGVuBxJiT5YC8=; b=pD6mVdxesXc+HXDIUTPZGyFURAs6uW+MP0HH6PYTja3+3mdcEkW0G53DkU9li31/LI GDtj2BPV7N5kjtpgNbd6hGFyMAhPLc9aTHHAFJDxiDdNtSj44rPLKLTraL1Ts+qNFY/b pk8tmLzBtFgoMzv/JZLqcP0N6Px1OMgWDWrDZFgSLdLWybsRBd7ZrnzVMWQadhcNAhdy oN4NxUegez6+IG3HcN87pgad0pYZN+NkjEW92nWc+lKELiIumfUkoXfJAZcXXTCJ85Gj siSVikcNgHgCx0Xc7ZRCWvFIqssSxKFyEK/iVT8gPrUZtiXIsdjjwNwaNyBp6CWvEFQO 8Hsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679967721; 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=kss2E4XS78XZ4HkoeCxVNy5Rmlet/VUGVuBxJiT5YC8=; b=3AN6bVB0ZFGszBsjNGn51Kpfyvx4tNDzLx0j5sDoUoPN7cWi0drz+2Sv5YmcGRQ6Xi kFrvACWp3GO7MXZv3G0nQkMK/GO2Cw78Dx3a5S5KKdhFDG+82pcBdhCCK2Ff4MG+URkv 8Pd/qZKnDx5NlsqfQs1bDTSLZyEKu8HbLBr3AVGQIQjovO+tNbz5sMBIuiU8D1EiisST Y5OCLMByQSxNcAkGhg+0Ab11q0FqHieFyNeFKBiSHH6bB/OcQq30J3XsDrF9N6zf8HJ0 RgBKTJq5MHMRopyG993OsIf2802yP6zEv7WqOoHhaXP8HExgsf887Ae8DDJ1w22uW2mb dwEA== X-Gm-Message-State: AAQBX9e7gPYzq0QXk2s+V7zk/glYoSG2w9xieTaNvQ9iO1Q4mb39II6X Ic8A+V5JbMPj8c4NLF6a6WoEhC8RIiHt X-Google-Smtp-Source: AKy350bYGPJNYyhxhXCLA1UFocDvhQpUP+0IpvNzAWrJdc6/PQyp9eEy8L5USH/xhnVuQ6HL+6pnf491/Uu9 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a544:20a5:5228:d98f]) (user=irogers job=sendgmr) by 2002:a05:6902:18c6:b0:b78:4788:525b with SMTP id ck6-20020a05690218c600b00b784788525bmr7956584ybb.0.1679967721048; Mon, 27 Mar 2023 18:42:01 -0700 (PDT) Date: Mon, 27 Mar 2023 18:40:58 -0700 In-Reply-To: <20230328014058.870413-1-irogers@google.com> Message-Id: <20230328014058.870413-7-irogers@google.com> Mime-Version: 1.0 References: <20230328014058.870413-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 6/6] perf util: Move perf_guest/host declarations From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Mathieu Poirier , Suzuki K Poulose , Kan Liang , Raul Silvera , Athira Rajeev , Ravi Bangoria , Florian Fischer , Rob Herring , Xing Zhengjun , Sean Christopherson , Chengdong Li , Denis Nikitin , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The definitions are in util.c so move the declarations to match. Signed-off-by: Ian Rogers --- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-kvm.c | 1 + tools/perf/perf.h | 4 ---- tools/perf/ui/hist.c | 2 +- tools/perf/util/cs-etm.c | 1 + tools/perf/util/event.c | 2 +- tools/perf/util/evlist.c | 1 + tools/perf/util/parse-events.c | 2 +- tools/perf/util/session.c | 2 +- tools/perf/util/top.c | 2 +- tools/perf/util/util.h | 3 +++ 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 22b526766e14..dbb0562d6a4f 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -6,7 +6,6 @@ * DSOs and symbol information, sort them and produce a diff. */ #include "builtin.h" -#include "perf.h" =20 #include "util/debug.h" #include "util/event.h" @@ -26,6 +25,7 @@ #include "util/spark.h" #include "util/block-info.h" #include "util/stream.h" +#include "util/util.h" #include #include #include diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index fb9dc0dc46f9..747d19336340 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -23,6 +23,7 @@ #include "util/data.h" #include "util/ordered-events.h" #include "util/kvm-stat.h" +#include "util/util.h" #include "ui/browsers/hists.h" #include "ui/progress.h" #include "ui/ui.h" diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 49e15e2be49e..c004dd4e65a3 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -2,14 +2,10 @@ #ifndef _PERF_PERF_H #define _PERF_PERF_H =20 -#include - #ifndef MAX_NR_CPUS #define MAX_NR_CPUS 2048 #endif =20 -extern bool perf_host, perf_guest; - enum perf_affinity { PERF_AFFINITY_SYS =3D 0, PERF_AFFINITY_NODE, diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 5075ecead5f3..f164bd26fc41 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -11,7 +11,7 @@ #include "../util/sort.h" #include "../util/evsel.h" #include "../util/evlist.h" -#include "../perf.h" +#include "../util/util.h" =20 /* hist period print (hpp) functions */ =20 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index f65bac5ddbdb..9e9c85533f05 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -38,6 +38,7 @@ #include "tsc.h" #include #include "util/synthetic-events.h" +#include "util/util.h" =20 struct cs_etm_auxtrace { struct auxtrace auxtrace; diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 1fa14598b916..31474b31899a 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -33,7 +33,7 @@ #include "bpf-event.h" #include "print_binary.h" #include "tool.h" -#include "../perf.h" +#include "util.h" =20 static const char *perf_event__names[] =3D { [0] =3D "TOTAL", diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index cc491a037836..df6af38ca22e 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -32,6 +32,7 @@ #include "util/pmu.h" #include "util/sample.h" #include "util/bpf-filter.h" +#include "util/util.h" #include #include #include diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index cc8e8766ca30..5ecde113e642 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -25,10 +25,10 @@ #include "util/parse-branch-options.h" #include "util/evsel_config.h" #include "util/event.h" -#include "perf.h" #include "util/parse-events-hybrid.h" #include "util/pmu-hybrid.h" #include "util/bpf-filter.h" +#include "util/util.h" #include "tracepoint.h" #include "thread_map.h" =20 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 7d8d057d1772..e2806791c76a 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -33,7 +33,7 @@ #include "stat.h" #include "tsc.h" #include "ui/progress.h" -#include "../perf.h" +#include "util.h" #include "arch/common.h" #include "units.h" #include diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c index b8b32431d2f7..be7157de0451 100644 --- a/tools/perf/util/top.c +++ b/tools/perf/util/top.c @@ -11,7 +11,7 @@ #include "parse-events.h" #include "symbol.h" #include "top.h" -#include "../perf.h" +#include "util.h" #include =20 #define SNPRINTF(buf, size, fmt, args...) \ diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 8bd515b67739..7c8915d92dca 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -20,6 +20,9 @@ extern const char perf_more_info_string[]; =20 extern const char *input_name; =20 +extern bool perf_host; +extern bool perf_guest; + /* General helper functions */ void usage(const char *err) __noreturn; void die(const char *err, ...) __noreturn __printf(1, 2); --=20 2.40.0.348.gf938b09366-goog