From nobody Fri Dec 19 21:11:47 2025 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 C1829C83F10 for ; Thu, 31 Aug 2023 15:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231645AbjHaPRu (ORCPT ); Thu, 31 Aug 2023 11:17:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345302AbjHaPRs (ORCPT ); Thu, 31 Aug 2023 11:17:48 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C4379E50; Thu, 31 Aug 2023 08:17:42 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CFB33C15; Thu, 31 Aug 2023 08:18:21 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 09F5C3F64C; Thu, 31 Aug 2023 08:17:38 -0700 (PDT) From: James Clark To: linux-perf-users@vger.kernel.org, irogers@google.com Cc: James Clark , John Garry , Will Deacon , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Jing Zhang , Haixin Yu , Kajol Jain , Madhavan Srinivasan , Ravi Bangoria , Yang Jihong , Eduard Zingerman , Miguel Ojeda , Chen Zhongjin , Liam Howlett , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/7] perf util: Add a function for replacing characters in a string Date: Thu, 31 Aug 2023 16:16:14 +0100 Message-Id: <20230831151632.124985-4-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230831151632.124985-1-james.clark@arm.com> References: <20230831151632.124985-1-james.clark@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It finds all occurrences of a single character and replaces them with a multi character string. This will be used in a test in a following commit. Signed-off-by: James Clark Reviewed-by: Ian Rogers --- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/util.c | 30 +++++++++++++++++++++ tools/perf/util/string.c | 48 +++++++++++++++++++++++++++++++++ tools/perf/util/string2.h | 1 + 6 files changed, 82 insertions(+) create mode 100644 tools/perf/tests/util.c diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 63d5e6d5f165..2b45ffa462a6 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -66,6 +66,7 @@ perf-y +=3D dlfilter-test.o perf-y +=3D sigtrap.o perf-y +=3D event_groups.o perf-y +=3D symbols.o +perf-y +=3D util.o =20 ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-tes= t.c index 0ad18cf6dd22..cb6f1dd00dc4 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -123,6 +123,7 @@ static struct test_suite *generic_tests[] =3D { &suite__sigtrap, &suite__event_groups, &suite__symbols, + &suite__util, NULL, }; =20 diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index f33cfc3c19a4..b394f3ac2d66 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -145,6 +145,7 @@ DECLARE_SUITE(dlfilter); DECLARE_SUITE(sigtrap); DECLARE_SUITE(event_groups); DECLARE_SUITE(symbols); +DECLARE_SUITE(util); =20 /* * PowerPC and S390 do not support creation of instruction breakpoints usi= ng the diff --git a/tools/perf/tests/util.c b/tools/perf/tests/util.c new file mode 100644 index 000000000000..43e66a620b83 --- /dev/null +++ b/tools/perf/tests/util.c @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "tests.h" +#include "util/debug.h" + +#include +#include +#include + +static int test_strreplace(char find, const char *s, const char *replace, = const char *expected) +{ + char *new =3D strreplace_chars(find, s, replace); + int ret =3D strcmp(new, expected); + + free(new); + return ret =3D=3D 0; +} + +static int test__util(struct test_suite *t __maybe_unused, int subtest __m= aybe_unused) +{ + TEST_ASSERT_VAL("empty string", test_strreplace(' ', "", "123", "")); + TEST_ASSERT_VAL("no match", test_strreplace('5', "123", "4", "123")); + TEST_ASSERT_VAL("replace 1", test_strreplace('3', "123", "4", "124")); + TEST_ASSERT_VAL("replace 2", test_strreplace('a', "abcabc", "ef", "efbcef= bc")); + TEST_ASSERT_VAL("replace long", test_strreplace('a', "abcabc", "longlong", + "longlongbclonglongbc")); + + return 0; +} + +DEFINE_SUITE("util", util); diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c index cf05b0b56c57..6410a683183e 100644 --- a/tools/perf/util/string.c +++ b/tools/perf/util/string.c @@ -301,3 +301,51 @@ unsigned int hex(char c) return c - 'a' + 10; return c - 'A' + 10; } + + +/* + * Replace all occurrences of character 'find' in string s with string 're= place' + * + * The new string could be longer so a new string is returned which must + * be freed. + */ +char *strreplace_chars(char find, const char *s, const char *replace) +{ + int replace_len =3D strlen(replace); + char *new_s, *to; + const char *loc =3D strchr(s, find); + const char *from =3D s; + int num =3D 0; + + /* Count occurrences */ + while (loc) { + loc =3D strchr(loc + 1, find); + num++; + } + + /* Allocate enough space for replacements and reset first location */ + new_s =3D malloc(strlen(s) + (num * (replace_len - 1) + 1)); + if (!new_s) + return NULL; + loc =3D strchr(s, find); + to =3D new_s; + + while (loc) { + /* Copy original string up to found char and update positions */ + memcpy(to, from, 1 + loc - from); + to +=3D loc - from; + from =3D loc + 1; + + /* Copy replacement string and update positions */ + memcpy(to, replace, replace_len); + to +=3D replace_len; + + /* Find next occurrence or end of string */ + loc =3D strchr(from, find); + } + + /* Copy any remaining chars + null */ + strcpy(to, from); + + return new_s; +} diff --git a/tools/perf/util/string2.h b/tools/perf/util/string2.h index 56c30fef9682..920488099214 100644 --- a/tools/perf/util/string2.h +++ b/tools/perf/util/string2.h @@ -39,5 +39,6 @@ char *strpbrk_esc(char *str, const char *stopset); char *strdup_esc(const char *str); =20 unsigned int hex(char c); +char *strreplace_chars(char find, const char *s, const char *replace); =20 #endif /* PERF_STRING_H */ --=20 2.34.1