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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 177CEC433E2 for ; Sun, 12 Jul 2020 13:26:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7E2720725 for ; Sun, 12 Jul 2020 13:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594560414; bh=994QkrXTe9Z+pu4cHpmpFUX6R4FH2vIgRNy2LPyTCG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WGjahVlaZUsQlL0xIdFNuFQGtmLbLg0LiT4LTfzB/eHhrOSdjRS9MghucKeuvAlxU m36xDJbF5AJ3wOZH5KpAAZOt5bGzxmVgCEUdTQM4QMhDttxiGFn0a2semYu+C6PUgh eyXpFMyiQ/rZXDz63BtfLNvxgG8cJF8TZs4ZOxS8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728889AbgGLN0w convert rfc822-to-8bit (ORCPT ); Sun, 12 Jul 2020 09:26:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36634 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728852AbgGLN0u (ORCPT ); Sun, 12 Jul 2020 09:26:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-95-0PM2iwI5N7eI_z8E8dvTkw-1; Sun, 12 Jul 2020 09:26:44 -0400 X-MC-Unique: 0PM2iwI5N7eI_z8E8dvTkw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED3791009442; Sun, 12 Jul 2020 13:26:42 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.192.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id A56DF7F8CC; Sun, 12 Jul 2020 13:26:39 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Michael Petlan , Andi Kleen , Kajol Jain , John Garry , "Paul A. Clarke" , Stephane Eranian , Ian Rogers Subject: [PATCH 01/18] perf metric: Rename expr__add_id to expr__add_val Date: Sun, 12 Jul 2020 15:26:17 +0200 Message-Id: <20200712132634.138901-2-jolsa@kernel.org> In-Reply-To: <20200712132634.138901-1-jolsa@kernel.org> References: <20200712132634.138901-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Renaming expr__add_id to expr__add_val so we can use expr__add_id to actually add just id without any value in following changes. There's no functional change. Signed-off-by: Jiri Olsa --- tools/perf/tests/expr.c | 4 ++-- tools/perf/tests/pmu-events.c | 4 ++-- tools/perf/util/expr.c | 2 +- tools/perf/util/expr.h | 2 +- tools/perf/util/expr.y | 2 +- tools/perf/util/stat-shadow.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c index b7e5ef3007fc..d13fc1dfd5ef 100644 --- a/tools/perf/tests/expr.c +++ b/tools/perf/tests/expr.c @@ -24,8 +24,8 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) struct expr_parse_ctx ctx; expr__ctx_init(&ctx); - expr__add_id(&ctx, strdup("FOO"), 1); - expr__add_id(&ctx, strdup("BAR"), 2); + expr__add_id_val(&ctx, strdup("FOO"), 1); + expr__add_id_val(&ctx, strdup("BAR"), 2); ret = test(&ctx, "1+1", 2); ret |= test(&ctx, "FOO+BAR", 3); diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index b66b021476ec..eb19f9a0bc15 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -492,7 +492,7 @@ static int test_parsing(void) */ k = 1; hashmap__for_each_entry((&ctx.ids), cur, bkt) - expr__add_id(&ctx, strdup(cur->key), k++); + expr__add_id_val(&ctx, strdup(cur->key), k++); hashmap__for_each_entry((&ctx.ids), cur, bkt) { if (check_parse_cpu(cur->key, map == cpus_map, @@ -547,7 +547,7 @@ static int metric_parse_fake(const char *str) */ i = 1; hashmap__for_each_entry((&ctx.ids), cur, bkt) - expr__add_id(&ctx, strdup(cur->key), i++); + expr__add_id_val(&ctx, strdup(cur->key), i++); hashmap__for_each_entry((&ctx.ids), cur, bkt) { if (check_parse_fake(cur->key)) { diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index e8f777830a23..9116a3a01eea 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -33,7 +33,7 @@ static bool key_equal(const void *key1, const void *key2, } /* Caller must make sure id is allocated */ -int expr__add_id(struct expr_parse_ctx *ctx, const char *name, double val) +int expr__add_id_val(struct expr_parse_ctx *ctx, const char *name, double val) { double *val_ptr = NULL, *old_val = NULL; char *old_key = NULL; diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index 8a2c1074f90f..bb6bac836b48 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -22,7 +22,7 @@ struct expr_scanner_ctx { void expr__ctx_init(struct expr_parse_ctx *ctx); void expr__ctx_clear(struct expr_parse_ctx *ctx); -int expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val); +int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val); int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr); int expr__parse(double *final_val, struct expr_parse_ctx *ctx, const char *expr, int runtime); diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y index 5fcb98800f9c..b2b3420ea6ec 100644 --- a/tools/perf/util/expr.y +++ b/tools/perf/util/expr.y @@ -69,7 +69,7 @@ all_other: all_other other other: ID { - expr__add_id(ctx, $1, 0.0); + expr__add_id_val(ctx, $1, 0.0); } | MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')' | ',' diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 8fdef47005e6..fc9ac4b4218e 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -773,9 +773,9 @@ static int prepare_metric(struct evsel **metric_events, *pn = 0; if (metric_total) - expr__add_id(pctx, n, metric_total); + expr__add_id_val(pctx, n, metric_total); else - expr__add_id(pctx, n, avg_stats(stats)*scale); + expr__add_id_val(pctx, n, avg_stats(stats)*scale); } return i; -- 2.25.4