Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2127150pxb; Sun, 17 Oct 2021 06:34:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQEWB1ePtAEQMQQszmIGhXTIHAj+cdTZTcwJS4E3ddXyZntove1yBltZ0aKXnd4xAFdad0 X-Received: by 2002:a17:90b:354:: with SMTP id fh20mr41470502pjb.188.1634477661956; Sun, 17 Oct 2021 06:34:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634477661; cv=none; d=google.com; s=arc-20160816; b=paw/au4cOsYM3IP9OFTOB0UnJYcZ5mCKgenBkmwD3l9YrP0vm/u4YvmBXerDK3vDHY Dkwoc0Oiq2dZRkgdtTIBsQ3gfDv/kkWHz3LODhxRRNbYhBvbCPbYAuEmZkaCq9jkZrFE 2vVeybkYIyANm2D9fcjsBZvzxXueDlY8weMTv62tpJVIKJWMVkRPV4yvq3p7hoBs3h30 uA4+WDm7684ybjcVDCjIYicetZTMUSpuR0rBYwjRpd6RaklGxjYULhwhM08Oo9PmlD2G XLA54T1VJrOW9xRq9VIjv6qZxme5blQq8oSWTGDkD4mej3Owkt1NmpUR5Tem7r7i9Pbh vUQg== 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=I7q/UjXdgOVhTC5GRLzsbIXbn3jS9TUQiER0V51CZnY=; b=WoyrXXte43aUoStxUs2zW/YNOs59xkxxhlZj22E0V0xG3PJ/DegOXKlQglkK2c4Njx LGgwGK4in4jRuyd9Fdz3AnCxI7eCk9ky81AhHatvzlFJvR3KwUPgXjW3FFcsLe0XTAH6 TUzbCw2M42ftt0Bwo1TEtr6PlYNEUb2nuz+NSLq8xyfgp4bcdG46lG5uCpJoM13Q2Y5f /POkWWiql95Mns3FAiE7zP5tD9TjpCBKgnaRz2i+3MtnhjTihx+S7yoqHXP16zvPCq73 5GowSG6xsfIMIchQGXz4NOJnZpC4a/ZjkxaVCLvLz7g4GVV1uvi4ZXuKTmBtPOHYdne1 xKrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=H9ynp2+T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a10si22421720pjv.62.2021.10.17.06.34.09; Sun, 17 Oct 2021 06:34:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=H9ynp2+T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S242287AbhJORYo (ORCPT + 99 others); Fri, 15 Oct 2021 13:24:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242294AbhJORYQ (ORCPT ); Fri, 15 Oct 2021 13:24:16 -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 BB579C061771 for ; Fri, 15 Oct 2021 10:22:09 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id b126-20020a251b84000000b005bd8aca71a2so11990511ybb.4 for ; Fri, 15 Oct 2021 10:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=I7q/UjXdgOVhTC5GRLzsbIXbn3jS9TUQiER0V51CZnY=; b=H9ynp2+TZNqpvFyYsKv9M+/LQFnrMELfpNaVZV0tNa7avoQ6rT0P5Ko+YeMs7kILQ6 yypmThaZ8T1aodSpP5O/98bLBo3HkBA8AgqS/KiR3la1vcDvEOUYSPdfwJapn0FIwPbD nV02GjeL2cexyr3aOsMImwboJwOLusED6tLIOY1Vfiuj2g7fEJTBjxmLFHnlElSL93LW MZFq0OljAn++uJcy7jT+az6m0q3wvCR06mKJR7Ue6zeNp00Fkxm261/WUUlQS25LZ88a jJljmfw2O6hQlvXZctDsQqQOWOWzEhNJBfOscwPwNgUL1P4UcnORdPui5Lz/9IbG45zv +9fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=I7q/UjXdgOVhTC5GRLzsbIXbn3jS9TUQiER0V51CZnY=; b=6QLmFuH5Me2Cqv2ptLBBoZYVuWD6wwS4+KB7BJVWQnd1OzA/ffITq6ROxFcrLt5KUI E65UzDhSH747dPSxPaVju5t/8pQXgNVybLX7hFvNcjcT6mrCJ1v8knh1rZf+CuLz8BKb ZGarrE/Nk2s/tiH29E6udcAnMTWMKj9b+h8F0INCeOmY86oVGPfTmC3KoqO9Oxeemhso qjn92JzaFYoX7xj5wG2152sOr1MST9jXsIeOGRnO619OQ1c0nkZfKf5koZHwYM4umiVE TCX5tM4xCrjhcMgTnVPop6oHjDsWYUK5hYoo39/LVLOKPgD/krHAAAOl8j30SpcQ8SW1 EU4A== X-Gm-Message-State: AOAM533mlBqywwKVSEjVvaUBRimCyHU2yt5Mn4UIm18TLb6zNk+UGO+7 GT84CX6xYqtAyEog1tj1xcGcetk7Orwe X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:69bc:7451:58ad:6585]) (user=irogers job=sendgmr) by 2002:a5b:846:: with SMTP id v6mr13126824ybq.457.1634318528822; Fri, 15 Oct 2021 10:22:08 -0700 (PDT) Date: Fri, 15 Oct 2021 10:21:24 -0700 In-Reply-To: <20211015172132.1162559-1-irogers@google.com> Message-Id: <20211015172132.1162559-14-irogers@google.com> Mime-Version: 1.0 References: <20211015172132.1162559-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 13/21] perf parse-events: Add const to evsel name From: Ian Rogers To: Andi Kleen , Jiri Olsa , Jin Yao , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Kees Cook , Sami Tolvanen , Nick Desaulniers , Andrew Morton , Jacob Keller , Zhen Lei , ToastC , Joakim Zhang , Felix Fietkau , Jiapeng Chong , Song Liu , Fabian Hemmer , Alexander Antonov , Nicholas Fraser , Adrian Hunter , Denys Zagorui , Wan Jiabing , Thomas Richter , Sumanth Korikkar , Heiko Carstens , Changbin Du , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andrew Kilroy Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The evsel name is strdup-ed before assignment and so can be const. A later change will add another similar string. Using const makes it clearer that these are not out arguments. Acked-by: Andi Kleen Signed-off-by: Ian Rogers --- tools/perf/util/parse-events-hybrid.c | 15 +++++++++------ tools/perf/util/parse-events-hybrid.h | 6 ++++-- tools/perf/util/parse-events.c | 15 ++++++++------- tools/perf/util/parse-events.h | 7 ++++--- tools/perf/util/pmu.c | 2 +- tools/perf/util/pmu.h | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/tools/perf/util/parse-events-hybrid.c b/tools/perf/util/parse-events-hybrid.c index b234d95fb10a..7e44deee1343 100644 --- a/tools/perf/util/parse-events-hybrid.c +++ b/tools/perf/util/parse-events-hybrid.c @@ -38,7 +38,7 @@ static void config_hybrid_attr(struct perf_event_attr *attr, static int create_event_hybrid(__u32 config_type, int *idx, struct list_head *list, - struct perf_event_attr *attr, char *name, + struct perf_event_attr *attr, const char *name, struct list_head *config_terms, struct perf_pmu *pmu) { @@ -70,7 +70,7 @@ static int pmu_cmp(struct parse_events_state *parse_state, static int add_hw_hybrid(struct parse_events_state *parse_state, struct list_head *list, struct perf_event_attr *attr, - char *name, struct list_head *config_terms) + const char *name, struct list_head *config_terms) { struct perf_pmu *pmu; int ret; @@ -94,7 +94,8 @@ static int add_hw_hybrid(struct parse_events_state *parse_state, } static int create_raw_event_hybrid(int *idx, struct list_head *list, - struct perf_event_attr *attr, char *name, + struct perf_event_attr *attr, + const char *name, struct list_head *config_terms, struct perf_pmu *pmu) { @@ -113,7 +114,7 @@ static int create_raw_event_hybrid(int *idx, struct list_head *list, static int add_raw_hybrid(struct parse_events_state *parse_state, struct list_head *list, struct perf_event_attr *attr, - char *name, struct list_head *config_terms) + const char *name, struct list_head *config_terms) { struct perf_pmu *pmu; int ret; @@ -138,7 +139,8 @@ static int add_raw_hybrid(struct parse_events_state *parse_state, int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state, struct list_head *list, struct perf_event_attr *attr, - char *name, struct list_head *config_terms, + const char *name, + struct list_head *config_terms, bool *hybrid) { *hybrid = false; @@ -159,7 +161,8 @@ int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state, } int parse_events__add_cache_hybrid(struct list_head *list, int *idx, - struct perf_event_attr *attr, char *name, + struct perf_event_attr *attr, + const char *name, struct list_head *config_terms, bool *hybrid, struct parse_events_state *parse_state) diff --git a/tools/perf/util/parse-events-hybrid.h b/tools/perf/util/parse-events-hybrid.h index f33bd67aa851..25a4a4f73f3a 100644 --- a/tools/perf/util/parse-events-hybrid.h +++ b/tools/perf/util/parse-events-hybrid.h @@ -11,11 +11,13 @@ int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state, struct list_head *list, struct perf_event_attr *attr, - char *name, struct list_head *config_terms, + const char *name, + struct list_head *config_terms, bool *hybrid); int parse_events__add_cache_hybrid(struct list_head *list, int *idx, - struct perf_event_attr *attr, char *name, + struct perf_event_attr *attr, + const char *name, struct list_head *config_terms, bool *hybrid, struct parse_events_state *parse_state); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 1acac3e13b32..88f181a985b7 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -337,7 +337,7 @@ static int parse_events__is_name_term(struct parse_events_term *term) return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME; } -static char *get_config_name(struct list_head *head_terms) +static const char *get_config_name(struct list_head *head_terms) { struct parse_events_term *term; @@ -355,7 +355,7 @@ static struct evsel * __add_event(struct list_head *list, int *idx, struct perf_event_attr *attr, bool init_attr, - char *name, struct perf_pmu *pmu, + const char *name, struct perf_pmu *pmu, struct list_head *config_terms, bool auto_merge_stats, const char *cpu_list) { @@ -394,14 +394,14 @@ __add_event(struct list_head *list, int *idx, } struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr, - char *name, struct perf_pmu *pmu) + const char *name, struct perf_pmu *pmu) { return __add_event(NULL, &idx, attr, false, name, pmu, NULL, false, NULL); } static int add_event(struct list_head *list, int *idx, - struct perf_event_attr *attr, char *name, + struct perf_event_attr *attr, const char *name, struct list_head *config_terms) { return __add_event(list, idx, attr, true, name, NULL, config_terms, @@ -464,7 +464,8 @@ int parse_events_add_cache(struct list_head *list, int *idx, { struct perf_event_attr attr; LIST_HEAD(config_terms); - char name[MAX_NAME_LEN], *config_name; + char name[MAX_NAME_LEN]; + const char *config_name; int cache_type = -1, cache_op = -1, cache_result = -1; char *op_result[2] = { op_result1, op_result2 }; int i, n, ret; @@ -2027,7 +2028,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) return 0; } -int parse_events_name(struct list_head *list, char *name) +int parse_events_name(struct list_head *list, const char *name) { struct evsel *evsel; @@ -3344,7 +3345,7 @@ char *parse_events_formats_error_string(char *additional_terms) struct evsel *parse_events__add_event_hybrid(struct list_head *list, int *idx, struct perf_event_attr *attr, - char *name, struct perf_pmu *pmu, + const char *name, struct perf_pmu *pmu, struct list_head *config_terms) { return __add_event(list, idx, attr, true, name, pmu, diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index b32ed3064c49..54d24c24d074 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -162,7 +162,7 @@ void parse_events_terms__purge(struct list_head *terms); void parse_events__clear_array(struct parse_events_array *a); int parse_events__modifier_event(struct list_head *list, char *str, bool add); int parse_events__modifier_group(struct list_head *list, char *event_mod); -int parse_events_name(struct list_head *list, char *name); +int parse_events_name(struct list_head *list, const char *name); int parse_events_add_tracepoint(struct list_head *list, int *idx, const char *sys, const char *event, struct parse_events_error *error, @@ -199,7 +199,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, bool use_alias); struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr, - char *name, struct perf_pmu *pmu); + const char *name, struct perf_pmu *pmu); int parse_events_multi_pmu_add(struct parse_events_state *parse_state, char *str, @@ -266,7 +266,8 @@ int perf_pmu__test_parse_init(void); struct evsel *parse_events__add_event_hybrid(struct list_head *list, int *idx, struct perf_event_attr *attr, - char *name, struct perf_pmu *pmu, + const char *name, + struct perf_pmu *pmu, struct list_head *config_terms); #endif /* __PERF_PARSE_EVENTS_H */ diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index cdd6c3f6caf1..9b5039bf909a 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1906,7 +1906,7 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu) } void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, - char *name) + const char *name) { struct perf_pmu_format *format; __u64 masks = 0, bits; diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index cc9f9e001347..f9743eab07b6 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -134,7 +134,7 @@ int perf_pmu__convert_scale(const char *scale, char **end, double *sval); int perf_pmu__caps_parse(struct perf_pmu *pmu); void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, - char *name); + const char *name); bool perf_pmu__has_hybrid(void); int perf_pmu__match(char *pattern, char *name, char *tok); -- 2.33.0.1079.g6e70778dc9-goog