From patchwork Fri Mar 1 17:15:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 86656 X-Patchwork-Delegate: dj@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B28173858421 for ; Fri, 1 Mar 2024 17:16:12 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 1B4D23858C66 for ; Fri, 1 Mar 2024 17:15:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B4D23858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B4D23858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::636 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709313335; cv=none; b=D3iwTz0Ugbjlo5TNi5IQq57cgxu+4ki7qWP+8InNz/wjotkJynEItjC+nY7fNIAKmGgZ++OVK4Q9X0bx0TO5P7a1c7feRHqvbEWLWdep5oSjKx9b6TqES9uBLXwrbcpBCXAcn5Yif1D23NdLw/ndZYpRfNbVkQkbi2OTBtdR57M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709313335; c=relaxed/simple; bh=TEm4RgpYhYNb7nKPTBpazbSvCWl2YZ25xMReLIgUAzg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=AhCwFcvhTYwrXBLgNUZSbf8fmaXutcaR1HV0uzeLXTVxYyJMS6L9PRrHYY+593YXOuxiOdKo2K0pEnJKg6AdPdGKT87Dy2UsCohM7SpblG7weMIx6e4TfV/G+qb5YqS+P8fkFt4pqABagWADUFAOIJzH5oYrOILxd9Pg2wgtYwk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1dc75972f25so21352805ad.1 for ; Fri, 01 Mar 2024 09:15:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709313331; x=1709918131; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HkwY2rUYnBPDz2C6ecq7ITnM+POyl7wwBsYj/QNqA18=; b=dshoxM6RgVtoL8215tVjVtqUExfarixei4ZnOUAkEPLtG3W4UWHv8pKuEE0R70IjgW kS18VW2f+Du7oWaOlJJjwmurHKnrHmaSsDj9n5169ZE09Z69dyYzisYSen1m/aLzw3hx +iUOZZebK6DUTAbePtjBATYxWR0mzAhWoLf2TCndpz1dLGRhAeemajZJAB60C5gvXemU xvanFmFLMkk8KPmN6UyTUbR1dC/qZ/iiv/mtUWmEUM5MSuhCTM49nV0weHR4Is0IoKRi 9YbZ3FJV7F+t4QvxEaBXu3THdebvl6vt5tPdz5sS4ORsHAZ+aQcKe8omVb6amMPYNpjT 89JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709313331; x=1709918131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HkwY2rUYnBPDz2C6ecq7ITnM+POyl7wwBsYj/QNqA18=; b=sim3zd9wgCZYbqNDGabp/w4lOo0U9OblGMupaIb5+cI12FZ9u0jGA1wCgDqV40lVeD sJXP7iC4xruIQG0nx7ivYE1haddDrhmYDs5d4dwyfVDp6Lae7SG7Ut+GXJA433E+1GmP CUAX/iSpvnfYZc0SaWJeWXgT4PkxvXtj6YyHgWnQ85QQQ4ZPrnEFDfveK9Lzl4//Yeqa M9EAvecGhazn6ObpRnb+++qkR0REUb5/4LET8KzVEGAPCAvIxhx1Rhqft//wSQGDQOsW jYazVbAyBVKzhZMLrV6BoxAyo53eUUgzjAFL3BXpAeVveyA/iQskLSb0kyhBGGa+rxVo P3HA== X-Gm-Message-State: AOJu0YytXrf5IYLvwo20oSfn9TW3sxIwkH9BTLJyBzuGEi4a0i8tx/q3 WexEmPMKjMFXX0PM1DjEC2zS126dUohM2aOUPjYzmihnFu5uSiK/M4lPSzv+qv2ilqjaOdPch+Z q X-Google-Smtp-Source: AGHT+IHbCWoyMLQs+9ijk+yLP/zWA7RBXiuqqgRJA/pbSiGu7+Gj9AuRbRlsjYC+kKulbOXOy6DtOg== X-Received: by 2002:a17:902:dac5:b0:1dc:78ea:1cf with SMTP id q5-20020a170902dac500b001dc78ea01cfmr2190257plx.58.1709313330781; Fri, 01 Mar 2024 09:15:30 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:c57d:9e2a:a00b:9999:1e87]) by smtp.gmail.com with ESMTPSA id h15-20020a170902f54f00b001d974ffa1fcsm3702407plf.173.2024.03.01.09.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 09:15:30 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: DJ Delorie Subject: [PATCH v2 1/2] wcsmbs: Add test-wcsstr Date: Fri, 1 Mar 2024 14:15:23 -0300 Message-Id: <20240301171524.3706554-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301171524.3706554-1-adhemerval.zanella@linaro.org> References: <20240301171524.3706554-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Parametrize test-strstr.c so it can be used to check wcsstr. Checked on x86_64-linux-gnu and aarch64-linux-gnu. --- string/test-strstr.c | 142 +++++++++++++++++++++++++++---------------- wcsmbs/Makefile | 1 + wcsmbs/test-wcsstr.c | 20 ++++++ wcsmbs/wcsstr.c | 8 ++- 4 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 wcsmbs/test-wcsstr.c diff --git a/string/test-strstr.c b/string/test-strstr.c index 4115f7d2fd..e628a3478a 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -17,21 +17,56 @@ . */ #define TEST_MAIN -#define TEST_NAME "strstr" -#include "test-string.h" +#ifndef WIDE +# define TEST_NAME "strstr" +# define TEST_FUNC strstr +#else +# define TEST_NAME "wcsstr" +# define TEST_FUNC wcsstr +#endif + +#ifndef WIDE +# define CHAR char +# define STRLEN strlen +# define STRCPY strcpy +# define MEMCPY memcpy +# define MEMSET memset +# define MEMPCPY mempcpy +# define L(s) s +#else +# include +# define CHAR wchar_t +# define STRLEN wcslen +# define STRCPY wcscpy +# define MEMCPY wmemcpy +# define MEMSET wmemset +# define MEMPCPY wmempcpy +# define L(s) L ## s +/* The test requires up to 8191 charateres, so allocate at least 32Kb + (considering 4kb page size). */ +# define BUF1PAGES 4 +#endif +#include "test-string.h" -#define STRSTR c_strstr -#define libc_hidden_builtin_def(arg) /* nothing */ -#define __strnlen strnlen -#include "strstr.c" +#ifndef WIDE +# define STRSTR c_strstr +# define libc_hidden_builtin_def(arg) /* nothing */ +# define __strnlen strnlen +# include "strstr.c" +# define C_IMPL STRSTR +#else +# define WCSSTR c_wcsstr +# include "wcsstr.c" +# define C_IMPL WCSSTR +#endif /* Naive implementation to verify results. */ -static char * -simple_strstr (const char *s1, const char *s2) +static CHAR * +simple_strstr (const CHAR *s1, const CHAR *s2) { - ssize_t s1len = strlen (s1); - ssize_t s2len = strlen (s2); + ssize_t s1len = STRLEN (s1); + ssize_t s2len = STRLEN (s2); if (s2len > s1len) return NULL; @@ -43,29 +78,27 @@ simple_strstr (const char *s1, const char *s2) if (s1[i + j] != s2[j]) break; if (j == s2len) - return (char *) s1 + i; + return (CHAR *) s1 + i; } return NULL; } -typedef char *(*proto_t) (const char *, const char *); - -IMPL (c_strstr, 0) -IMPL (strstr, 1) +typedef CHAR *(*proto_t) (const CHAR *, const CHAR *); +IMPL (C_IMPL, 1) +IMPL (TEST_FUNC, 1) static int -check_result (impl_t *impl, const char *s1, const char *s2, - char *exp_result) +check_result (impl_t *impl, const CHAR *s1, const CHAR *s2, + CHAR *exp_result) { - char *result = CALL (impl, s1, s2); + CHAR *result = CALL (impl, s1, s2); if (result != exp_result) { - error (0, 0, "Wrong result in function %s %s %s", impl->name, - (result == NULL) ? "(null)" : result, - (exp_result == NULL) ? "(null)" : exp_result); + error (0, 0, "Wrong result in function %s %p %p", impl->name, + result, exp_result); ret = 1; return -1; } @@ -74,7 +107,7 @@ check_result (impl_t *impl, const char *s1, const char *s2, } static void -do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result) +do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, CHAR *exp_result) { if (check_result (impl, s1, s2, exp_result) < 0) return; @@ -85,49 +118,51 @@ static void do_test (size_t align1, size_t align2, size_t len1, size_t len2, int fail) { - char *s1 = (char *) (buf1 + align1); - char *s2 = (char *) (buf2 + align2); + align1 = align1 * sizeof (CHAR); + align2 = align2 * sizeof (CHAR); - static const char d[] = "1234567890abcdef"; -#define dl (sizeof (d) - 1) - char *ss2 = s2; + CHAR *s1 = (CHAR *) (buf1 + align1); + CHAR *s2 = (CHAR *) (buf2 + align2); + + static const CHAR d[] = L("1234567890abcdef"); + const size_t dl = STRLEN (d); + CHAR *ss2 = s2; for (size_t l = len2; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - ss2 = mempcpy (ss2, d, t); + ss2 = MEMPCPY (ss2, d, t); } s2[len2] = '\0'; if (fail) { - char *ss1 = s1; + CHAR *ss1 = s1; for (size_t l = len1; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - memcpy (ss1, d, t); + MEMCPY (ss1, d, t); ++ss1[len2 > 7 ? 7 : len2 - 1]; ss1 += t; } } else { - memset (s1, '0', len1); - memcpy (s1 + len1 - len2, s2, len2); + MEMSET (s1, '0', len1); + MEMCPY (s1 + len1 - len2, s2, len2); } s1[len1] = '\0'; FOR_EACH_IMPL (impl, 0) do_one_test (impl, s1, s2, fail ? NULL : s1 + len1 - len2); - } static void check1 (void) { - const char s1[] = - "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"; - const char s2[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; - char *exp_result; + const CHAR s1[] = + L("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"); + const CHAR s2[] = L("_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + CHAR *exp_result; exp_result = simple_strstr (s1, s2); FOR_EACH_IMPL (impl, 0) @@ -137,30 +172,31 @@ check1 (void) static void check2 (void) { - const char s1_stack[] = ", enable_static, \0, enable_shared, "; - const size_t s1_byte_count = 18; - const char *s2_stack = &(s1_stack[s1_byte_count]); - const size_t s2_byte_count = 18; - char *exp_result; + const CHAR s1_stack[] = L(", enable_static, \0, enable_shared, "); + const size_t s1_char_count = 18; + const size_t s1_byte_len = 18 * sizeof (CHAR); + const CHAR *s2_stack = &(s1_stack[s1_char_count]); + const size_t s2_byte_len = 18 * sizeof (CHAR); + CHAR *exp_result; const size_t page_size_real = getpagesize (); /* Haystack at end of page. The following page is protected. */ - char *s1_page_end = (void *) buf1 + page_size - s1_byte_count; - strcpy (s1_page_end, s1_stack); + CHAR *s1_page_end = (void *) buf1 + page_size - s1_byte_len; + STRCPY (s1_page_end, s1_stack); /* Haystack which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s1_page_cross = (void *) buf1 + page_size_real - 8; - strcpy (s1_page_cross, s1_stack); + CHAR *s1_page_cross = (void *) buf1 + page_size_real - 8; + STRCPY (s1_page_cross, s1_stack); /* Needle at end of page. The following page is protected. */ - char *s2_page_end = (void *) buf2 + page_size - s2_byte_count; - strcpy (s2_page_end, s2_stack); + CHAR *s2_page_end = (void *) buf2 + page_size - s2_byte_len; + STRCPY (s2_page_end, s2_stack); /* Needle which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s2_page_cross = (void *) buf2 + page_size_real - 8; - strcpy (s2_page_cross, s2_stack); + CHAR *s2_page_cross = (void *) buf2 + page_size_real - 8; + STRCPY (s2_page_cross, s2_stack); exp_result = simple_strstr (s1_stack, s2_stack); FOR_EACH_IMPL (impl, 0) @@ -184,8 +220,8 @@ check2 (void) static void pr23637 (void) { - char *h = (char*) buf1; - char *n = (char*) buf2; + CHAR *h = (CHAR*) buf1; + CHAR *n = (CHAR*) buf2; for (int i = 0; i < N; i++) { @@ -200,7 +236,7 @@ pr23637 (void) /* Ensure we don't match at the first 'x'. */ h[0] = 'x'; - char *exp_result = simple_strstr (h, n); + CHAR *exp_result = simple_strstr (h, n); FOR_EACH_IMPL (impl, 0) check_result (impl, h, n, exp_result); } diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index f3333c6a4b..1cddd8cc6d 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -163,6 +163,7 @@ tests := \ test-wcspbrk \ test-wcsrchr \ test-wcsspn \ + test-wcsstr \ test-wmemchr \ test-wmemcmp \ test-wmemset \ diff --git a/wcsmbs/test-wcsstr.c b/wcsmbs/test-wcsstr.c new file mode 100644 index 0000000000..23d6517255 --- /dev/null +++ b/wcsmbs/test-wcsstr.c @@ -0,0 +1,20 @@ +/* Test wcsstr function. + Copyright (C) 2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define WIDE 1 +#include diff --git a/wcsmbs/wcsstr.c b/wcsmbs/wcsstr.c index 78f1cc9ce0..ec5687e8d7 100644 --- a/wcsmbs/wcsstr.c +++ b/wcsmbs/wcsstr.c @@ -28,8 +28,12 @@ #include +#ifndef WCSSTR +# define WCSSTR wcsstr +#endif + wchar_t * -wcsstr (const wchar_t *haystack, const wchar_t *needle) +WCSSTR (const wchar_t *haystack, const wchar_t *needle) { wchar_t b, c; @@ -92,6 +96,8 @@ foundneedle: ret0: return NULL; } +#ifndef WCSSTR /* This alias is for backward compatibility with drafts of the ISO C standard. Unfortunately the Unix(TM) standard requires this name. */ weak_alias (wcsstr, wcswcs) +#endif From patchwork Fri Mar 1 17:15:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 86657 X-Patchwork-Delegate: dj@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0183C3858416 for ; Fri, 1 Mar 2024 17:16:17 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 49C983858C32 for ; Fri, 1 Mar 2024 17:15:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 49C983858C32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 49C983858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709313340; cv=none; b=vmNmoYZCeUDEF2tI3++Q3z9XcW6Ta1NF21jgeoyl58xCkoQE4buEUPdofPqdO2XMZHulzA6mPEdsuk6dDfqIAoL8bUZ++UzhqukYsGhZSiODHTtrjsNOyRPtVrqcJ3/tgkqGQJbPoE0cVO6IkLMzIUmbywsQXkzmAW/mIK6pmcI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709313340; c=relaxed/simple; bh=+XhFuUkYeZDea6o6WKulw/nJeYU5SWF33Ck7FNygryg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=DdspJ0Ro4OMQuF5kBU26t5TYLHpQGvfGi5NihyxshjsNXxmfR49z2Rfica58zm5aJKCRVE+HaAy73QASNp5UkaEqGlRG6Y4uHFxsdH9m38aWUyLDd68QA8vIUJZ3OZmojy9/9NMugbWTBt8fg7clNLhg+41gpDk6qKe8lUVGy0c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1dcd6a3da83so17311965ad.3 for ; Fri, 01 Mar 2024 09:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709313334; x=1709918134; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ppkHrpFWFZ4T/epvnt/POnr/0ntibCWxJiVTZoiqEPg=; b=I8gNyLPZsT8ioLeLgDaoOu6YejS6pjXGUEAiOoz42LK4BgQMTlDYkrS1T5pGXy/Bzi qGt08daDvnHZK43Dv7wuKcjGMzrPKzci+tfoks06kx5qkflMHU8YL1yj2141Wq+hLjn/ g8X2p7whzCqRqoJbLlEPpJ3EiMbJA04ol8w+l2YHcZnapY4s/FDf+qojY6IwEz9/r6bP D45hrPqwrF03Bx8r3mBpU5I6ZRv89XvpEl2O1OfeAquzi/ENK4TxODKZRgwWkRtYYU27 U50geht6ZlJlNbrODS151rudh+jG2gJFcD626rZZ95Awm2eqwvUsjIqLCredKPSZw9/d 9f3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709313334; x=1709918134; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ppkHrpFWFZ4T/epvnt/POnr/0ntibCWxJiVTZoiqEPg=; b=sSqU76yHFE79oT3fCyJv0JBoHtQypwR4IKPviQh53XeLM/qHOtLaZyl+vzVxZ9eLvu 8j78TzxeFLExf83lMvwExnUamV8mprpfn19MJPpaXmof30iU7vmGymeTFwglVecsLR1+ azNSpXXhq5moO7/YJ2ZWFljyu+LOXHDLJ3sRtuRPTKuhebK1ILctD637JgEOi/9DjXD6 WR44lfRQ6tD2wPDSnpv/GkZy1MrpA68WFaL7mlUAHas/dDFHc/j4pkQtVy7fJXVhdiKu gTjEbrXBrqujaAOJdY1UdXtWUTdbOb5OJNMM4MvoFDg8NgVKkgOxXdTYEk+Mcz7pRqLi 2c2Q== X-Gm-Message-State: AOJu0YySpfNyQE/NzNZEZTpeKNhZ9LtAr5wTbDAjAy0jLgquIG5m9uBo LJuenQovx5QbIjNwB2D2i9wRN7dUA7AaY7ygySGvylfpIRWkzf0ErrsoWu4CN6xHJP6pn+f+IMI i X-Google-Smtp-Source: AGHT+IE+mFsBArVSKiOM71ImPeOl59a1NUJGAxcC6NbmNBq46+LoMXxapkjsAfcO8L2xHgo3g8W5iA== X-Received: by 2002:a17:902:c146:b0:1d4:cd4d:923b with SMTP id 6-20020a170902c14600b001d4cd4d923bmr2027756plj.54.1709313333353; Fri, 01 Mar 2024 09:15:33 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:c57d:9e2a:a00b:9999:1e87]) by smtp.gmail.com with ESMTPSA id h15-20020a170902f54f00b001d974ffa1fcsm3702407plf.173.2024.03.01.09.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 09:15:31 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: DJ Delorie Subject: [PATCH v2 2/2] wcsmbs: Ensure wcstr worst-case linear execution time (BZ 23865) Date: Fri, 1 Mar 2024 14:15:24 -0300 Message-Id: <20240301171524.3706554-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301171524.3706554-1-adhemerval.zanella@linaro.org> References: <20240301171524.3706554-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org It uses the same two-way algorithm used on strstr, strcasestr, and memmem. Different than strstr, neither the "shift table" optimization nor the self-adapting filtering check is used because it would result in a too-large shift table (and it also simplifies the implementation bit). Checked on x86_64-linux-gnu and aarch64-linux-gnu. --- string/test-strstr.c | 180 +++++++++++++++++++++++++ wcsmbs/wcs-two-way.h | 312 +++++++++++++++++++++++++++++++++++++++++++ wcsmbs/wcsstr.c | 95 ++++--------- 3 files changed, 515 insertions(+), 72 deletions(-) create mode 100644 wcsmbs/wcs-two-way.h diff --git a/string/test-strstr.c b/string/test-strstr.c index e628a3478a..9cb5f226e5 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -57,6 +57,9 @@ # define C_IMPL STRSTR #else # define WCSSTR c_wcsstr +# define __wmemcmp wmemcmp +# define __wcsnlen wcsnlen +# define __wcslen wcslen # include "wcsstr.c" # define C_IMPL WCSSTR #endif @@ -215,6 +218,31 @@ check2 (void) } } +static void +check3 (void) +{ + /* Check that a long periodic needle does not cause false positives. */ + { + const CHAR input[] = L("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD"); + const CHAR need[] = L("_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + FOR_EACH_IMPL (impl, 0) + check_result (impl, input, need, NULL); + } + + { + const CHAR input[] = L("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" + "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + const CHAR need[] = L("_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + FOR_EACH_IMPL (impl, 0) + check_result (impl, input, need, (CHAR *) input + 115); + } +} + + #define N 1024 static void @@ -241,6 +269,156 @@ pr23637 (void) check_result (impl, h, n, exp_result); } +static void +pr23865 (void) +{ + /* Check that a very long haystack is handled quickly if the needle is + short and occurs near the beginning. */ + { + size_t repeat = 10000; + size_t m = 1000000; + const CHAR *needle = + L("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); + CHAR *haystack = xmalloc ((m + 1) * sizeof (CHAR)); + MEMSET (haystack, L('A'), m); + haystack[0] = L('B'); + haystack[m] = L('\0'); + + for (; repeat > 0; repeat--) + { + FOR_EACH_IMPL (impl, 0) + check_result (impl, haystack, needle, haystack + 1); + } + + free (haystack); + } + + /* Check that a very long needle is discarded quickly if the haystack is + short. */ + { + size_t repeat = 10000; + size_t m = 1000000; + const CHAR *haystack = + L("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "ABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB"); + CHAR *needle = xmalloc ((m + 1) * sizeof (CHAR)); + MEMSET (needle, L'A', m); + needle[m] = L('\0'); + + for (; repeat > 0; repeat--) + { + FOR_EACH_IMPL (impl, 0) + check_result (impl, haystack, needle, NULL); + } + + free (needle); + } + + /* Check that the asymptotic worst-case complexity is not quadratic. */ + { + size_t m = 1000000; + CHAR *haystack = xmalloc ((2 * m + 2) * sizeof (CHAR)); + CHAR *needle = xmalloc ((m + 2) * sizeof (CHAR)); + + MEMSET (haystack, L('A'), 2 * m); + haystack[2 * m] = L('B'); + haystack[2 * m + 1] = L('\0'); + + MEMSET (needle, L('A'), m); + needle[m] = L('B'); + needle[m + 1] = L('\0'); + + FOR_EACH_IMPL (impl, 0) + check_result (impl, haystack, needle, haystack + m); + + free (needle); + free (haystack); + } + + { + /* Ensure that with a barely periodic "short" needle, STRSTR's + search does not mistakenly skip just past the match point. */ + const CHAR *haystack = + L("\n" + "with_build_libsubdir\n" + "with_local_prefix\n" + "with_gxx_include_dir\n" + "with_cpp_install_dir\n" + "enable_generated_files_in_srcdir\n" + "with_gnu_ld\n" + "with_ld\n" + "with_demangler_in_ld\n" + "with_gnu_as\n" + "with_as\n" + "enable_largefile\n" + "enable_werror_always\n" + "enable_checking\n" + "enable_coverage\n" + "enable_gather_detailed_mem_stats\n" + "enable_build_with_cxx\n" + "with_stabs\n" + "enable_multilib\n" + "enable___cxa_atexit\n" + "enable_decimal_float\n" + "enable_fixed_point\n" + "enable_threads\n" + "enable_tls\n" + "enable_objc_gc\n" + "with_dwarf2\n" + "enable_shared\n" + "with_build_sysroot\n" + "with_sysroot\n" + "with_specs\n" + "with_pkgversion\n" + "with_bugurl\n" + "enable_languages\n" + "with_multilib_list\n"); + const CHAR *needle = + L("\n" + "with_gnu_ld\n"); + + FOR_EACH_IMPL (impl, 0) + check_result (impl, haystack, needle, (CHAR*) haystack + 114); + } + + { + /* Same bug, shorter trigger. */ + const CHAR *haystack = L("..wi.d."); + const CHAR *needle = L(".d."); + FOR_EACH_IMPL (impl, 0) + check_result (impl, haystack, needle, (CHAR*) haystack + 4); + } + + /* Test case from Yves Bastide. + */ + { + const CHAR *input = L("playing play play play always"); + const CHAR *needle = L("play play play"); + FOR_EACH_IMPL (impl, 0) + check_result (impl, input, needle, (CHAR*) input + 8); + } + + /* Test long needles. */ + { + size_t m = 1024; + CHAR *haystack = xmalloc ((2 * m + 1) * sizeof (CHAR)); + CHAR *needle = xmalloc ((m + 1) * sizeof (CHAR)); + haystack[0] = L('x'); + MEMSET (haystack + 1, L(' '), m - 1); + MEMSET (haystack + m, L('x'), m); + haystack[2 * m] = L('\0'); + MEMSET (needle, L('x'), m); + needle[m] = L('\0'); + + FOR_EACH_IMPL (impl, 0) + check_result (impl, haystack, needle, haystack + m); + + free (needle); + free (haystack); + } +} + static int test_main (void) { @@ -248,7 +426,9 @@ test_main (void) check1 (); check2 (); + check3 (); pr23637 (); + pr23865 (); printf ("%23s", ""); FOR_EACH_IMPL (impl, 0) diff --git a/wcsmbs/wcs-two-way.h b/wcsmbs/wcs-two-way.h new file mode 100644 index 0000000000..fae4750aeb --- /dev/null +++ b/wcsmbs/wcs-two-way.h @@ -0,0 +1,312 @@ +/* Wide character substring search, using the Two-Way algorithm. + Copyright (C) 2008-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Before including this file, you need to include (and + before that, if not part of libc), and define: + AVAILABLE(h, h_l, j, n_l) + A macro that returns nonzero if there are + at least N_L characters left starting at H[J]. + H is 'wchar_t *', H_L, J, and N_L are 'size_t'; + H_L is an lvalue. For NUL-terminated searches, + H_L can be modified each iteration to avoid + having to compute the end of H up front. + + For case-insensitivity, you may optionally define: + CMP_FUNC(p1, p2, l) A macro that returns 0 iff the first L + characters of P1 and P2 are equal. + CANON_ELEMENT(c) A macro that canonicalizes an element right after + it has been fetched from one of the two strings. + The argument is an 'wchar_t'; the result must + be an 'wchar_t' as well. +*/ + +#include +#include +#include /* Defines MAX. */ + +/* We use the Two-Way string matching algorithm, which guarantees + linear complexity with constant space. + + See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260 + and http://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm +*/ + +#ifndef CANON_ELEMENT +# define CANON_ELEMENT(c) c +#endif +#ifndef CMP_FUNC +# define CMP_FUNC __wmemcmp +#endif + +/* Perform a critical factorization of NEEDLE, of length NEEDLE_LEN. + Return the index of the first character in the right half, and set + *PERIOD to the global period of the right half. + + The global period of a string is the smallest index (possibly its + length) at which all remaining bytes in the string are repetitions + of the prefix (the last repetition may be a subset of the prefix). + + When NEEDLE is factored into two halves, a local period is the + length of the smallest word that shares a suffix with the left half + and shares a prefix with the right half. All factorizations of a + non-empty NEEDLE have a local period of at least 1 and no greater + than NEEDLE_LEN. + + A critical factorization has the property that the local period + equals the global period. All strings have at least one critical + factorization with the left half smaller than the global period. + + Given an ordered alphabet, a critical factorization can be computed + in linear time, with 2 * NEEDLE_LEN comparisons, by computing the + larger of two ordered maximal suffixes. The ordered maximal + suffixes are determined by lexicographic comparison of + periodicity. */ +static size_t +critical_factorization (const wchar_t *needle, size_t needle_len, + size_t *period) +{ + /* Index of last character of left half, or SIZE_MAX. */ + size_t max_suffix, max_suffix_rev; + size_t j; /* Index into NEEDLE for current candidate suffix. */ + size_t k; /* Offset into current period. */ + size_t p; /* Intermediate period. */ + wchar_t a, b; /* Current comparison bytes. */ + + /* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered + out 0-length needles. */ + if (needle_len < 3) + { + *period = 1; + return needle_len - 1; + } + + /* Invariants: + 0 <= j < NEEDLE_LEN - 1 + -1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed) + min(max_suffix, max_suffix_rev) < global period of NEEDLE + 1 <= p <= global period of NEEDLE + p == global period of the substring NEEDLE[max_suffix{,_rev}+1...j] + 1 <= k <= p + */ + + /* Perform lexicographic search. */ + max_suffix = SIZE_MAX; + j = 0; + k = p = 1; + while (j + k < needle_len) + { + a = CANON_ELEMENT (needle[j + k]); + b = CANON_ELEMENT (needle[max_suffix + k]); + if (a < b) + { + /* Suffix is smaller, period is entire prefix so far. */ + j += k; + k = 1; + p = j - max_suffix; + } + else if (a == b) + { + /* Advance through repetition of the current period. */ + if (k != p) + ++k; + else + { + j += p; + k = 1; + } + } + else /* b < a */ + { + /* Suffix is larger, start over from current location. */ + max_suffix = j++; + k = p = 1; + } + } + *period = p; + + /* Perform reverse lexicographic search. */ + max_suffix_rev = SIZE_MAX; + j = 0; + k = p = 1; + while (j + k < needle_len) + { + a = CANON_ELEMENT (needle[j + k]); + b = CANON_ELEMENT (needle[max_suffix_rev + k]); + if (b < a) + { + /* Suffix is smaller, period is entire prefix so far. */ + j += k; + k = 1; + p = j - max_suffix_rev; + } + else if (a == b) + { + /* Advance through repetition of the current period. */ + if (k != p) + ++k; + else + { + j += p; + k = 1; + } + } + else /* a < b */ + { + /* Suffix is larger, start over from current location. */ + max_suffix_rev = j++; + k = p = 1; + } + } + + /* Choose the shorter suffix. Return the first character of the right + half, rather than the last character of the left half. */ + if (max_suffix_rev + 1 < max_suffix + 1) + return max_suffix + 1; + *period = p; + return max_suffix_rev + 1; +} + +/* Return the first location of non-empty NEEDLE within HAYSTACK, or + NULL. HAYSTACK_LEN is the minimum known length of HAYSTACK. + + If AVAILABLE does not modify HAYSTACK_LEN (as in memmem), then at + most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. + If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 * + HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. */ +static inline wchar_t * +two_way_short_needle (const wchar_t *haystack, size_t haystack_len, + const wchar_t *needle, size_t needle_len) +{ + size_t i; /* Index into current character of NEEDLE. */ + size_t j; /* Index into current window of HAYSTACK. */ + size_t period; /* The period of the right half of needle. */ + size_t suffix; /* The index of the right half of needle. */ + + /* Factor the needle into two halves, such that the left half is + smaller than the global period, and the right half is + periodic (with a period as large as NEEDLE_LEN - suffix). */ + suffix = critical_factorization (needle, needle_len, &period); + + /* Perform the search. Each iteration compares the right half + first. */ + if (CMP_FUNC (needle, needle + period, suffix) == 0) + { + /* Entire needle is periodic; a mismatch can only advance by the + period, so use memory to avoid rescanning known occurrences + of the period. */ + size_t memory = 0; + j = 0; + while (AVAILABLE (haystack, haystack_len, j, needle_len)) + { + const wchar_t *pneedle; + const wchar_t *phaystack; + + /* Scan for matches in right half. */ + i = MAX (suffix, memory); + pneedle = &needle[i]; + phaystack = &haystack[i + j]; + while (i < needle_len && (CANON_ELEMENT (*pneedle++) + == CANON_ELEMENT (*phaystack++))) + ++i; + if (needle_len <= i) + { + /* Scan for matches in left half. */ + i = suffix - 1; + pneedle = &needle[i]; + phaystack = &haystack[i + j]; + while (memory < i + 1 && (CANON_ELEMENT (*pneedle--) + == CANON_ELEMENT (*phaystack--))) + --i; + if (i + 1 < memory + 1) + return (wchar_t *) (haystack + j); + /* No match, so remember how many repetitions of period + on the right half were scanned. */ + j += period; + memory = needle_len - period; + } + else + { + j += i - suffix + 1; + memory = 0; + } + } + } + else + { + const wchar_t *phaystack; + /* The comparison always starts from needle[suffix], so cache it + and use an optimized first-character loop. */ + wchar_t needle_suffix = CANON_ELEMENT (needle[suffix]); + + /* The two halves of needle are distinct; no extra memory is + required, and any mismatch results in a maximal shift. */ + period = MAX (suffix, needle_len - suffix) + 1; + j = 0; + while (AVAILABLE (haystack, haystack_len, j, needle_len)) + { + wchar_t haystack_char; + const wchar_t *pneedle; + + phaystack = &haystack[suffix + j]; + + while (needle_suffix + != (haystack_char = CANON_ELEMENT (*phaystack++))) + { + ++j; + if (!AVAILABLE (haystack, haystack_len, j, needle_len)) + goto ret0; + } + + /* Scan for matches in right half. */ + i = suffix + 1; + pneedle = &needle[i]; + while (i < needle_len) + { + if (CANON_ELEMENT (*pneedle++) + != (haystack_char = CANON_ELEMENT (*phaystack++))) + break; + ++i; + } + if (needle_len <= i) + { + /* Scan for matches in left half. */ + i = suffix - 1; + pneedle = &needle[i]; + phaystack = &haystack[i + j]; + while (i != SIZE_MAX) + { + if (CANON_ELEMENT (*pneedle--) + != (haystack_char = CANON_ELEMENT (*phaystack--))) + break; + --i; + } + if (i == SIZE_MAX) + return (wchar_t *) (haystack + j); + j += period; + } + else + j += i - suffix + 1; + } + } +ret0: __attribute__ ((unused)) + return NULL; +} + +#undef AVAILABLE +#undef CANON_ELEMENT +#undef CMP_FUNC diff --git a/wcsmbs/wcsstr.c b/wcsmbs/wcsstr.c index ec5687e8d7..d9a1180a37 100644 --- a/wcsmbs/wcsstr.c +++ b/wcsmbs/wcsstr.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995-2024 Free Software Foundation, Inc. +/* Locate a substring in a wide-character string. + Copyright (C) 1995-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,18 +16,14 @@ License along with the GNU C Library; if not, see . */ -/* - * The original strstr() file contains the following comment: - * - * My personal strstr() implementation that beats most other algorithms. - * Until someone tells me otherwise, I assume that this is the - * fastest implementation of strstr() in C. - * I deliberately chose not to comment it. You should have at least - * as much fun trying to understand it, as I had to write it :-). - * - * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */ - #include +#include + +#define AVAILABLE(h, h_l, j, n_l) \ + (((j) + (n_l) <= (h_l)) \ + || ((h_l) += __wcsnlen ((void*)((h) + (h_l)), (n_l) + 128), \ + (j) + (n_l) <= (h_l))) +#include "wcs-two-way.h" #ifndef WCSSTR # define WCSSTR wcsstr @@ -35,66 +32,20 @@ wchar_t * WCSSTR (const wchar_t *haystack, const wchar_t *needle) { - wchar_t b, c; - - if ((b = *needle) != L'\0') - { - haystack--; /* possible ANSI violation */ - do - if ((c = *++haystack) == L'\0') - goto ret0; - while (c != b); - - if (!(c = *++needle)) - goto foundneedle; - ++needle; - goto jin; - - for (;;) - { - wchar_t a; - const wchar_t *rhaystack, *rneedle; - - do - { - if (!(a = *++haystack)) - goto ret0; - if (a == b) - break; - if ((a = *++haystack) == L'\0') - goto ret0; -shloop: ; - } - while (a != b); - -jin: if (!(a = *++haystack)) - goto ret0; - - if (a != c) - goto shloop; - - if (*(rhaystack = haystack-- + 1) == (a = *(rneedle = needle))) - do - { - if (a == L'\0') - goto foundneedle; - if (*++rhaystack != (a = *++needle)) - break; - if (a == L'\0') - goto foundneedle; - } - while (*++rhaystack == (a = *++needle)); - - needle = rneedle; /* took the register-poor approach */ - - if (a == L'\0') - break; - } - } -foundneedle: - return (wchar_t*) haystack; -ret0: - return NULL; + /* Ensure haystack length is at least as long as needle length. + Since a match may occur early on in a huge haystack, use strnlen + and read ahead a few cachelines for improved performance. */ + size_t ne_len = __wcslen (needle); + size_t hs_len = __wcsnlen (haystack, ne_len | 128); + if (hs_len < ne_len) + return NULL; + + /* Check whether we have a match. This improves performance since we + avoid initialization overheads. */ + if (__wmemcmp (haystack, needle, ne_len) == 0) + return (wchar_t *) haystack; + + return two_way_short_needle (haystack, hs_len, needle, ne_len); } #ifndef WCSSTR /* This alias is for backward compatibility with drafts of the ISO C