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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6765C27C53 for ; Sun, 9 Jun 2024 11:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:From:Cc:To :Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=NM+tTDXk8mfcvRWGg2GFlA5WCMl+LvrEgW7NzSeW8+4=; b=lPjDFi0+P6wVFI f6QiflGFIupCOayTohsImZJzUB7vgZ0bc8dKboK/1ZhkY2AUrhFOzA8AjwX4F9mMFecjmEu0pLpaQ b7W7WEUlqo0/sSXSbZxfAYprp2Tm1B5bbXl+VxqJAPMYboPA6bbrZzHW6t7vGQfiat0mBoLpP1b1g WuYSxWpYhfJYOzlm7otF1PdbBlgiD4426o0C3xkH6Po6uFIoD0HWJ7MHPmmoO0YS76rk827JU0cSU l0VrVH/3Eu33tj4fpdqo9NgZTL7ryvj1Jx4lhBwUIEOF1pyUiK8uM8Rf/aWVsMl2F3brVGAKEePkY rsb6okbVfS9ZXlpo383Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGGY2-00000002TeO-26eT; Sun, 09 Jun 2024 11:17:18 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGGXz-00000002Tda-0Bby for linux-arm-kernel@lists.infradead.org; Sun, 09 Jun 2024 11:17:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 3B20F6116F; Sun, 9 Jun 2024 11:17:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C018C2BD10; Sun, 9 Jun 2024 11:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717931833; bh=EOv95M2LXzmbEI1OUCIlGwbojk2SRW7db0xf94MXxVo=; h=Subject:To:Cc:From:Date:From; b=PoHmdWdMxCW6lEowAdi/OE19Nw55zfhhgci4JJRPSZK+n96vMz2fGONjy7Wnj1kV3 Op12UhKW92vP7Ad9waiLY7FignimALbwnYmMJFBtRu2NyYltyMIY7ev8SaMfI6mfJt MmMjtYifCyVbEX8dHuvJLFVGsBIl2P7ot3YDy3v8= Subject: Patch "perf util: Add a function for replacing characters in a string" has been added to the 6.6-stable tree To: acme@redhat.com,adrian.hunter@intel.com,alexander.shishkin@linux.intel.com,chenzhongjin@huawei.com,eddyz87@gmail.com,gregkh@linuxfoundation.org,irogers@google.com,james.clark@arm.com,john.g.garry@oracle.com,jolsa@kernel.org,kan.liang@linux.intel.com,kjain@linux.ibm.com,leo.yan@linaro.org,liam.howlett@oracle.com,linux-arm-kernel@lists.infradead.org,maddy@linux.ibm.com,mark.rutland@arm.com,mike.leach@linaro.org,mingo@redhat.com,namhyung@kernel.org,peterz@infradead.org,ravi.bangoria@amd.com,renyu.zj@linux.alibaba.com,will@kernel.org,yangjihong1@huawei.com,yuhaixin.yhx@linux.alibaba.com Cc: From: Date: Sun, 09 Jun 2024 13:17:03 +0200 Message-ID: <2024060902-koala-utilize-1829@gregkh> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240609_041715_213578_9E8B79AE X-CRM114-Status: GOOD ( 22.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled perf util: Add a function for replacing characters in a string to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-util-add-a-function-for-replacing-characters-in-a-string.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 8a55c1e2c9e123b399b272a7db23f09dbb74af21 Mon Sep 17 00:00:00 2001 From: James Clark Date: Mon, 4 Sep 2023 10:50:45 +0100 Subject: perf util: Add a function for replacing characters in a string From: James Clark commit 8a55c1e2c9e123b399b272a7db23f09dbb74af21 upstream. 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. Reviewed-by: Ian Rogers Signed-off-by: James Clark Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Chen Zhongjin Cc: Eduard Zingerman Cc: Haixin Yu Cc: Ingo Molnar Cc: Jing Zhang Cc: Jiri Olsa Cc: John Garry Cc: Kajol Jain Cc: Kan Liang Cc: Leo Yan Cc: Liam Howlett Cc: Madhavan Srinivasan Cc: Mark Rutland Cc: Mike Leach Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Ravi Bangoria Cc: Will Deacon Cc: Yang Jihong Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20230904095104.1162928-4-james.clark@arm.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/tests/Build | 1 tools/perf/tests/builtin-test.c | 1 tools/perf/tests/tests.h | 1 tools/perf/tests/util.c | 31 +++++++++++++++++++++++++ tools/perf/util/string.c | 48 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/string2.h | 1 6 files changed, 83 insertions(+) create mode 100644 tools/perf/tests/util.c --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -66,6 +66,7 @@ perf-y += dlfilter-test.o perf-y += sigtrap.o perf-y += event_groups.o perf-y += symbols.o +perf-y += util.o ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -123,6 +123,7 @@ static struct test_suite *generic_tests[ &suite__sigtrap, &suite__event_groups, &suite__symbols, + &suite__util, NULL, }; --- 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); /* * PowerPC and S390 do not support creation of instruction breakpoints using the --- /dev/null +++ b/tools/perf/tests/util.c @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "tests.h" +#include "util/debug.h" + +#include +#include +#include + +static int test_strreplace(char needle, const char *haystack, + const char *replace, const char *expected) +{ + char *new = strreplace_chars(needle, haystack, replace); + int ret = strcmp(new, expected); + + free(new); + return ret == 0; +} + +static int test__util(struct test_suite *t __maybe_unused, int subtest __maybe_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", "efbcefbc")); + TEST_ASSERT_VAL("replace long", test_strreplace('a', "abcabc", "longlong", + "longlongbclonglongbc")); + + return 0; +} + +DEFINE_SUITE("util", util); --- 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 'needle' in string 'haystack' with + * string 'replace' + * + * The new string could be longer so a new string is returned which must be + * freed. + */ +char *strreplace_chars(char needle, const char *haystack, const char *replace) +{ + int replace_len = strlen(replace); + char *new_s, *to; + const char *loc = strchr(haystack, needle); + const char *from = haystack; + int num = 0; + + /* Count occurrences */ + while (loc) { + loc = strchr(loc + 1, needle); + num++; + } + + /* Allocate enough space for replacements and reset first location */ + new_s = malloc(strlen(haystack) + (num * (replace_len - 1) + 1)); + if (!new_s) + return NULL; + loc = strchr(haystack, needle); + to = new_s; + + while (loc) { + /* Copy original string up to found char and update positions */ + memcpy(to, from, 1 + loc - from); + to += loc - from; + from = loc + 1; + + /* Copy replacement string and update positions */ + memcpy(to, replace, replace_len); + to += replace_len; + + /* needle next occurrence or end of string */ + loc = strchr(from, needle); + } + + /* Copy any remaining chars + null */ + strcpy(to, from); + + return new_s; +} --- a/tools/perf/util/string2.h +++ b/tools/perf/util/string2.h @@ -39,5 +39,6 @@ char *strpbrk_esc(char *str, const char char *strdup_esc(const char *str); unsigned int hex(char c); +char *strreplace_chars(char needle, const char *haystack, const char *replace); #endif /* PERF_STRING_H */ Patches currently in stable-queue which might be from james.clark@arm.com are queue-6.6/perf-ui-browser-avoid-segv-on-title.patch queue-6.6/perf-pmu-count-sys-and-cpuid-json-events-separately.patch queue-6.6/perf-symbols-fix-ownership-of-string-in-dso__load_vm.patch queue-6.6/perf-tests-make-test-data-symbol-more-robust-on-neov.patch queue-6.6/perf-tests-apply-attributes-to-all-events-in-object-.patch queue-6.6/perf-pmu-compat-supports-regular-expression-matching.patch queue-6.6/perf-evlist-add-evlist__findnew_tracking_event-helpe.patch queue-6.6/perf-util-add-a-function-for-replacing-characters-in-a-string.patch queue-6.6/perf-evlist-add-perf_evlist__go_system_wide-helper.patch queue-6.6/perf-record-lazy-load-kernel-symbols.patch queue-6.6/perf-maps-move-symbol-maps-functions-to-maps.c.patch queue-6.6/perf-ui-browser-don-t-save-pointer-to-stack-memory.patch queue-6.6/perf-record-move-setting-tracking-events-before-reco.patch queue-6.6/perf-report-avoid-segv-in-report__setup_sample_type.patch queue-6.6/perf-tools-add-use-pmu-reverse-lookup-from-config-to.patch queue-6.6/perf-thread-fixes-to-thread__new-related-to-initiali.patch queue-6.6/perf-pmu-assume-sysfs-events-are-always-the-same-cas.patch queue-6.6/coresight-etm4x-fix-unbalanced-pm_runtime_enable.patch queue-6.6/perf-pmu-move-pmu__find_core_pmu-to-pmus.c.patch queue-6.6/perf-test-add-a-test-for-strcmp_cpuid_str-expression.patch queue-6.6/perf-test-shell-arm_coresight-increase-buffer-size-f.patch queue-6.6/perf-record-delete-session-after-stopping-sideband-t.patch queue-6.6/perf-tools-use-pmus-to-describe-type-from-attribute.patch queue-6.6/perf-machine-thread-remove-exited-threads-by-default.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel