From mboxrd@z Thu Jan 1 00:00:00 1970 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 19724C7EE22 for ; Fri, 28 Apr 2023 07:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345616AbjD1Hlj (ORCPT ); Fri, 28 Apr 2023 03:41:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345687AbjD1HlH (ORCPT ); Fri, 28 Apr 2023 03:41:07 -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 892935B83 for ; Fri, 28 Apr 2023 00:40:48 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54f855ecb9cso135065247b3.0 for ; Fri, 28 Apr 2023 00:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682667647; x=1685259647; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zbXUvllmN6lOIJh0HhCJsy55EV0m+rfCvLXAqUgmSBg=; b=D42i6N3+ccjH//e1G3S+nF9vNelVkHZvTAnroVPYLg6f6oGAymGZcwbwtWkeyec8UF q2hHXqvwVX6gzkQOhSvlryw0rMOiM/mJDM/yIn4uv7Htp9JZo08adKGAJ/F08kq8Oaoa ihSRZ9DuwJ+s6W4pEMznJeosp6XdGDM+u+15V3FAxMM+CmewhEFIY8HkGBGCzvqsvod+ 0fCYpKj7KkLfjoFkCBj73mxJb3XSIS8b1k4qFyI2emc8BGg1BblQa9QUGD9kY5V5wfgY wiFJL49+LRXWckeA9Wnex2aP+UlYkq3RxOn2rT5C46b1h1l4pPQRPE3fww9xjVnZGrro hoUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682667647; x=1685259647; 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=zbXUvllmN6lOIJh0HhCJsy55EV0m+rfCvLXAqUgmSBg=; b=jn/BaTT2iHdcRDhQE7Nnx7fvALpTZWOe7yW4qX9wtt75BuvTBFW/2ljUtUJqHbxNm4 ng8ws8huxz1108TVlEYI9m70wknAItEBswxvQpuaWASIvxf39BHmwUX4rzBKa2PCcpOb nVk82Oi/s1rUxumrjvl3P88ld33rt6Myb7envXhOKBisyJnyRQZCuv07n61CiAjZqJ8q b5Ebufv785+IOSHz2L9dOOqIzkkdOGJJQYluZxedV7eSX5FZJitLpF/QJ4AdVD1+aDxO ko/XrOxDCR9InJ89suH6W8DJqXco2Fm9WpC9FfAe+AqW1aKn3S3qyhnjzSNl8W4Bvei8 s+Hg== X-Gm-Message-State: AC+VfDzdEH249CAyJZUOzKSgEHgbOAoV2TuwQ4bljxFYxvhGmErS1YT3 12g3HVFKHflOXqa1am2/Uaz4/VgAxxDl X-Google-Smtp-Source: ACHHUZ71V9pkhdG7rcKIlESdiUEMEYUnhW0I3qGE6myj2T+rXemGxA2EA5SlXnqh7+gfUSEEx5BdhMtG+G2r X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:24a7:aeb5:5de4:c29b]) (user=irogers job=sendgmr) by 2002:a05:690c:725:b0:556:d398:8714 with SMTP id bt5-20020a05690c072500b00556d3988714mr2607081ywb.0.1682667647450; Fri, 28 Apr 2023 00:40:47 -0700 (PDT) Date: Fri, 28 Apr 2023 00:37:42 -0700 In-Reply-To: <20230428073809.1803624-1-irogers@google.com> Message-Id: <20230428073809.1803624-17-irogers@google.com> Mime-Version: 1.0 References: <20230428073809.1803624-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v2 16/43] perf parse-events: Set pmu_name whenever a pmu is given From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Change add_event to always set pmu_name when possible as not all code checks both pmu->name and evsel->pmu_name, for example, uniquify_counter in stat-display.c. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 4ba01577618e..5ade1cc8851d 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -269,6 +269,7 @@ __add_event(struct list_head *list, int *idx, evsel->core.requires_cpu = pmu ? pmu->is_uncore : false; evsel->auto_merge_stats = auto_merge_stats; evsel->pmu = pmu; + evsel->pmu_name = pmu && pmu->name ? strdup(pmu->name) : NULL; if (name) evsel->name = strdup(name); @@ -1500,12 +1501,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, /*metric_id=*/NULL, pmu, /*config_terms=*/NULL, auto_merge_stats, /*cpu_list=*/NULL); - if (evsel) { - evsel->pmu_name = name ? strdup(name) : NULL; - return 0; - } else { - return -ENOMEM; - } + return evsel ? 0 : -ENOMEM; } if (!parse_state->fake_pmu && perf_pmu__check_alias(pmu, head_config, &info)) @@ -1561,7 +1557,6 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, if (evsel->name) evsel->use_config_name = true; - evsel->pmu_name = name ? strdup(name) : NULL; evsel->percore = config_term_percore(&evsel->config_terms); if (parse_state->fake_pmu) -- 2.40.1.495.gc816e09b53d-goog