From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 1C1FC53E23 for ; Sat, 7 Sep 2024 05:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725685736; cv=none; b=Wtvu5XalEU3s65fu4QCYeCe41RNftaqMPMcx5B0wcA+NuvFYXsdGcdloVwaZ7u8dplf/mZUfraXkQKNBkuF6/9x8TxQjDEkAsUQJcdNJ732xZqb+uV8m2J5ZYzOgCThtqb3fMU8qGWoD7B0ECRTV8WobTWtvRqf6fUnDmPUh14w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725685736; c=relaxed/simple; bh=4cOZXSssGH5UHbeiNemyHw9AfNWWkQY3k/4vv6r+rYg=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=YZ2DuYnKU4zL1gyqgJ3RctnI9T8GMb5RWbiCFTcl6QYDUUyEO49UeFZtnyG+ZVNVUMm/7Vvorw8Tx/z9OTDQ5070Kc7AkHWFVguS5s7QFh7mDlrpFLVXkG16qyCfkhBv8S6xMCcB4h8bZYnoFQzWbvMlIK6yBZp8d8wROM+6FEQ= 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=rSmLK2b6; arc=none smtp.client-ip=209.85.128.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="rSmLK2b6" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6d34c57a88eso96948487b3.0 for ; Fri, 06 Sep 2024 22:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725685734; x=1726290534; 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=K446thzmdZyY//9ueXzoZapLMwoJZQ44b1S89B5s8Ac=; b=rSmLK2b65RgRfYaJ4UToZO3bKX/CB+Ymaji0pJTBk8tYPPNMqmSx5C7wcdkVoQCeEK MjMOxjCfQz/2HAnKZg0y5JZKYnn/+WhF+O0rIE/8O/t1bVojmihm0s5LEHGPPwJ5LB3A v99qizbQAU8A5xJZ2xUg7zT1MNjfVYyn7tQHgyYW2hi8Qf2Dc5kvEVAI42nqpDpOiM8h VAwrQXLUbT6dUA97Pf2MSZP18HzfItTmoURaPoKk4uuIYrf8155mE62v1qlO/v/AxPfv JJaZltjAxuqZdkVOnzgQk6MrQtttlToFl6t2bt8DYYHzpadgRFsV7p6xK7Pr/aWCaI5b qPmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725685734; x=1726290534; 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=K446thzmdZyY//9ueXzoZapLMwoJZQ44b1S89B5s8Ac=; b=fCFic3HEHEh8wNABpLCtQ9fmJ8U5zHjshLtyfDpyMSl60rGwjNRhpTmaRTPzBu9m6H Lpi2Q9tM3aItpP+8PSxCNxVvkD5R24BS+PxKn2YReOaWAVnXM1moCcbdp88focjM3Tlr uXhAsmZOaqG1xaRrDxBqPNPOel4aIUMLU6/9ynJ1b4IcjL6RwFo3oLhT25eqey0ARpvf Wz48Qeb+SWrxLRoFdVralwtPgd8GOcPHyaOXjc6glwHT5E/UpFZaHa3oPHNheGm8Px0k OXU5PdYmBIKe/1QlglgIRGS9I6B864K4Hmj7kS/7akl1FnVF48plXl2WameSSG98Ooxk D62A== X-Forwarded-Encrypted: i=1; AJvYcCVpExY0Lv5saoq6qKF1i+ITrAQRe1unNH01oGoOL9dcTNNXMqZ3WP1y7MygIR4WjHeYWMiSRRaFF0P0P6nd1tLe@vger.kernel.org X-Gm-Message-State: AOJu0Yyj1TF0pZ/RvMgzEhl8fW03LL5DYtfz5pM8z5DGRzI5xeHnm80I eQuX7c8xW7cK0aGEcs6gHciMkY7+ZgpP9SCby/WiuEsdYoEXSvhDj6Ha0n9Nxl/iT/9BMTg0y2y +aqxOBg== X-Google-Smtp-Source: AGHT+IG5ulMeYZYI+0rmqtyIoRb8/mTAk4z4SLB4POy1XLmQNC5TMS8PJhGseVM70zE/iZ51QJ2+nhNJuJxc X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:90e5:a813:c3d3:daed]) (user=irogers job=sendgmr) by 2002:a05:690c:b1d:b0:61c:89a4:dd5f with SMTP id 00721157ae682-6db44a5d1eamr3228967b3.0.1725685734285; Fri, 06 Sep 2024 22:08:54 -0700 (PDT) Date: Fri, 6 Sep 2024 22:08:21 -0700 In-Reply-To: <20240907050830.6752-1-irogers@google.com> Message-Id: <20240907050830.6752-7-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: <20240907050830.6752-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 06/15] perf parse-events: Expose/rename config_term_name 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ravi Bangoria , Weilin Wang , Jing Zhang , Xu Yang , Sandipan Das , Benjamin Gray , Athira Jajeev , Howard Chu , Dominique Martinet , Yang Jihong , Colin Ian King , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , Ze Gao , Andi Kleen , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Sun Haiyong , Junhao He , Tiezhu Yang , Yicong Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Expose config_term_name as parse_events__term_type_str so that PMUs not in pmu.c may access it. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 20 +++++++++++--------- tools/perf/util/parse-events.h | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 30b78fe8d704..b68a744f41ba 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -772,7 +772,7 @@ static int check_type_val(struct parse_events_term *term, static bool config_term_shrinked; -static const char *config_term_name(enum parse_events__term_type term_type) +const char *parse_events__term_type_str(enum parse_events__term_type term_type) { /* * Update according to parse-events.l @@ -858,7 +858,7 @@ config_term_avail(enum parse_events__term_type term_type, struct parse_events_er /* term_type is validated so indexing is safe */ if (asprintf(&err_str, "'%s' is not usable in 'perf stat'", - config_term_name(term_type)) >= 0) + parse_events__term_type_str(term_type)) >= 0) parse_events_error__handle(err, -1, err_str, NULL); return false; } @@ -982,7 +982,7 @@ do { \ case PARSE_EVENTS__TERM_TYPE_HARDWARE: default: parse_events_error__handle(err, term->err_term, - strdup(config_term_name(term->type_term)), + strdup(parse_events__term_type_str(term->type_term)), parse_events_formats_error_string(NULL)); return -EINVAL; } @@ -1105,8 +1105,9 @@ static int config_term_tracepoint(struct perf_event_attr *attr, default: if (err) { parse_events_error__handle(err, term->err_term, - strdup(config_term_name(term->type_term)), - strdup("valid terms: call-graph,stack-size\n")); + strdup(parse_events__term_type_str(term->type_term)), + strdup("valid terms: call-graph,stack-size\n") + ); } return -EINVAL; } @@ -2546,7 +2547,7 @@ int parse_events_term__num(struct parse_events_term **term, struct parse_events_term temp = { .type_val = PARSE_EVENTS__TERM_TYPE_NUM, .type_term = type_term, - .config = config ? : strdup(config_term_name(type_term)), + .config = config ? : strdup(parse_events__term_type_str(type_term)), .no_value = no_value, .err_term = loc_term ? loc_term->first_column : 0, .err_val = loc_val ? loc_val->first_column : 0, @@ -2580,7 +2581,7 @@ int parse_events_term__term(struct parse_events_term **term, void *loc_term, void *loc_val) { return parse_events_term__str(term, term_lhs, NULL, - strdup(config_term_name(term_rhs)), + strdup(parse_events__term_type_str(term_rhs)), loc_term, loc_val); } @@ -2687,7 +2688,8 @@ int parse_events_terms__to_strbuf(const struct parse_events_terms *terms, struct if (ret < 0) return ret; } else if ((unsigned int)term->type_term < __PARSE_EVENTS__TERM_TYPE_NR) { - ret = strbuf_addf(sb, "%s=", config_term_name(term->type_term)); + ret = strbuf_addf(sb, "%s=", + parse_events__term_type_str(term->type_term)); if (ret < 0) return ret; } @@ -2707,7 +2709,7 @@ static void config_terms_list(char *buf, size_t buf_sz) buf[0] = '\0'; for (i = 0; i < __PARSE_EVENTS__TERM_TYPE_NR; i++) { - const char *name = config_term_name(i); + const char *name = parse_events__term_type_str(i); if (!config_term_avail(i, NULL)) continue; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index bfbf391451d9..cf3f07db0295 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -162,6 +162,8 @@ struct parse_events_state { bool wild_card_pmus; }; +const char *parse_events__term_type_str(enum parse_events__term_type term_type); + bool parse_events__filter_pmu(const struct parse_events_state *parse_state, const struct perf_pmu *pmu); void parse_events__shrink_config_terms(void); -- 2.46.0.469.g59c65b2a67-goog