From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by sourceware.org (Postfix) with ESMTPS id 0BFBE3858D33 for ; Fri, 7 Apr 2023 18:19:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0BFBE3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-17ac5ee3f9cso46408047fac.12 for ; Fri, 07 Apr 2023 11:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680891582; x=1683483582; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=o2mS/ukLU9gAw1+stpZfiQyqT8XCq1AtdxkWoL/cyrU=; b=uZ1lm2VWfbWsj1U6/QOXyn9D5NUbuTZW7G8juyWRCtpEi9B5WvC/M82bOGje9z0mLe iOGabbwr4436yHe6GKJS2iMmFRgFVQi/9qt99EdQem/dnBJm8zyqPC7qgrkD2FyCZWim cy4Gzs/QXTKbVnr/7XExBD4L+fLTUOg6B4m1Bbds+CXbDnHaPdGZpcwQuj9dO7oWAUvd XG5ctVmoQYZ7coIE13/M3iyYoKBZFnrw2but7gGv1M0xP+yFXLfmHBHIdbcmk05aOeow If9nzb5dq/Rxb0f1/LdDI7bPIAPGeWoPSvATDYcpRMbinkyBC90fDQeUfd6P5RY8vd38 4M9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680891582; x=1683483582; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o2mS/ukLU9gAw1+stpZfiQyqT8XCq1AtdxkWoL/cyrU=; b=ZIKN5DXbRHvERl8kBB7J67Ru5jrinVsYNyH7eaC5T/yjyxUIFP+MIjnQhUW0fPzyLW Wzibfy6XKRaxrDnd0x2PKi33MneHyJQlXp+cdQt+NivwqzpTXqrUl9w5XJOAdOZkba+L kMoj7ifr5+dhMHqkm81Aa57yT0CQiEr5i5+lIeqdpwSyBiSc9lye1CctSW9k/hnIzndA Xwi+e1BjsNhT8GLuRLKq61Vi9s2jp5JhAaOZYzaNO2VZOptNYdCMGTI0RDCwfmDq5ZXr 5RApWE3R0dEk5SS/+xB2YaeQ2RYAyrkslToa5E+4RB0dvMPRboH0jroFV/DO4dRr7v1N ei6g== X-Gm-Message-State: AAQBX9c27hyVrQICm8juL5lv1QXHgug2eWQ+rl0OA8hkomecTQz93Gy8 jXCEcqO/UI3f1A+uTAxI+RiZMal+TwcY1C8gP5/fLQ== X-Google-Smtp-Source: AKy350aWXtWZAYkWuRlqbMR4XwIZtjynCi/xdPZA6rxHNT6+PGmzZ4L58FlxtESGJlijF9tH/sXr6w== X-Received: by 2002:a05:6870:9625:b0:17a:b026:dacc with SMTP id d37-20020a056870962500b0017ab026daccmr1868788oaq.52.1680891582353; Fri, 07 Apr 2023 11:19:42 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c1:e5a5:c0c1:f69:cfce:1b3? ([2804:1b3:a7c1:e5a5:c0c1:f69:cfce:1b3]) by smtp.gmail.com with ESMTPSA id w24-20020a9d77d8000000b00690e990e61asm1901542otl.14.2023.04.07.11.19.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 07 Apr 2023 11:19:41 -0700 (PDT) Message-ID: Date: Fri, 7 Apr 2023 15:19:38 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH v3 2/3] string: Add tests for strdup (BZ #30266) Content-Language: en-US To: libc-alpha@sourceware.org, Joe Simmons-Talbott References: <20230329150500.2886135-1-josimmon@redhat.com> <20230404190040.2507343-1-josimmon@redhat.com> <20230404190040.2507343-3-josimmon@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20230404190040.2507343-3-josimmon@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 04/04/23 16:00, Joe Simmons-Talbott via Libc-alpha wrote: > Copy strcpy tests for strdup. Covers some basic testcases with random > strings. Add a zero-length string testcase. Just minor style issue. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > string/Makefile | 1 + > string/test-strdup.c | 201 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 202 insertions(+) > create mode 100644 string/test-strdup.c > > diff --git a/string/Makefile b/string/Makefile > index c84b49aaa5..472e318aea 100644 > --- a/string/Makefile > +++ b/string/Makefile > @@ -157,6 +157,7 @@ tests := \ > test-strcmp \ > test-strcpy \ > test-strcspn \ > + test-strdup \ > test-strlen \ > test-strncasecmp \ > test-strncat \ > diff --git a/string/test-strdup.c b/string/test-strdup.c > new file mode 100644 > index 0000000000..f45fb4c852 > --- /dev/null > +++ b/string/test-strdup.c > @@ -0,0 +1,201 @@ > +/* Test and measure strdup functions. > + Copyright (C) 2023 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 > + . */ > + > +#include > + > +#ifdef WIDE > +# include > +# define CHAR wchar_t > +# define UCHAR wchar_t > +# define sfmt "ls" > +# define BIG_CHAR WCHAR_MAX > +# define SMALL_CHAR 1273 > +# define STRCMP wcscmp > +# define MEMCMP wmemcmp > +# define MEMSET wmemset > +#else > +# define CHAR char > +# define UCHAR unsigned char > +# define sfmt "s" > +# define BIG_CHAR CHAR_MAX > +# define SMALL_CHAR 127 > +# define STRCMP strcmp > +# define MEMCMP memcmp > +# define MEMSET memset > +#endif Do you plan to add wcsdup tests as well? > + > +#ifndef STRDUP_RESULT > +# define STRDUP_RESULT(dst, len) dst > +# define TEST_MAIN > +# ifndef WIDE > +# define TEST_NAME "strdup" > +# else > +# define TEST_NAME "wcsdup" > +# endif > +# include "test-string.h" > +# ifndef WIDE > +# define STRDUP strdup > +# else > +# define STRDUP wcsdup > +# endif > +#endif > + > +typedef CHAR *(*proto_t) (const CHAR *); > + > +static void > +do_zero_len_test (void) > +{ > + char src[1] = { '\0' }; > + char *dst = STRDUP (src); > + > + TEST_COMPARE_STRING (dst, src); > + free(dst); > +} > + > +static void > +do_one_test (const CHAR *src, > + size_t len __attribute__((unused))) > +{ > + char *dst = STRDUP (src); > + > + if (STRCMP (dst, src) != 0) > + { > + error (0, 0, > + "Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"", > + TEST_NAME, dst, src); > + ret = 1; > + free(dst); Indentation seems off here. > + return; > + } > + free(dst); > +} > + > +static void > +do_test (size_t align1, size_t align2, size_t len, int max_char) > +{ > + size_t i; > + CHAR *s1; > +/* For wcsdup: align1 and align2 here mean alignment not in bytes, > + but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) > + len for wcschr here isn't in bytes but it's number of wchar_t symbols. */ > + align1 &= 7; > + if ((align1 + len) * sizeof (CHAR) >= page_size) > + return; > + > + align2 &= 7; > + if ((align2 + len) * sizeof (CHAR) >= page_size) > + return; > + > + s1 = (CHAR *) (buf1) + align1; > + > + for (i = 0; i < len; i++) > + s1[i] = 32 + 23 * i % (max_char - 32); > + s1[len] = 0; > + > + do_one_test (s1, len); > +} > + > +static void > +do_random_tests (void) > +{ > + size_t i, j, n, align1, align2, len; > + UCHAR *p1 = (UCHAR *) (buf1 + page_size) - 512; > + UCHAR *res; > + > + for (n = 0; n < ITERATIONS; n++) > + { > + /* align1 and align2 are expressed as wchar_t and not in bytes for wide > + char test, and thus it will be equal to align times wchar_t size. > + > + For non wide version we need to check all alignments from 0 to 63 > + since some assembly implementations have separate prolog for alignments > + more 48. */ > + > + align1 = random () & (63 / sizeof (CHAR)); > + if (random () & 1) > + align2 = random () & (63 / sizeof (CHAR)); > + else > + align2 = align1 + (random () & 24); > + len = random () & 511; > + j = align1; > + if (align2 > j) > + j = align2; > + if (len + j >= 511) > + len = 510 - j - (random () & 7); > + j = len + align1 + 64; > + if (j > 512) > + j = 512; > + for (i = 0; i < j; i++) > + { > + if (i == len + align1) > + p1[i] = 0; > + else > + { > + p1[i] = random () & BIG_CHAR; > + if (i >= align1 && i < len + align1 && !p1[i]) > + p1[i] = (random () & SMALL_CHAR) + 3; > + } > + } > + > + res = (UCHAR *) STRDUP((CHAR *) p1 + align1); Indentation seems off. > + TEST_COMPARE_STRING((CHAR *) res, (CHAR *) (p1 + align1)); > + free(res); Missing space before '('. > + } > +} > + > + > +int > +test_main (void) > +{ > + size_t i; > + > + test_init (); > + > + printf ("%23s", ""); > + printf ("\t%s", TEST_NAME); > + putchar ('\n'); > + > + for (i = 0; i < 16; ++i) > + { > + do_test (0, 0, i, SMALL_CHAR); > + do_test (0, 0, i, BIG_CHAR); > + do_test (0, i, i, SMALL_CHAR); > + do_test (i, 0, i, BIG_CHAR); > + } > + > + for (i = 1; i < 8; ++i) > + { > + do_test (0, 0, 8 << i, SMALL_CHAR); > + do_test (8 - i, 2 * i, 8 << i, SMALL_CHAR); > + } > + > + for (i = 1; i < 8; ++i) > + { > + do_test (i, 2 * i, 8 << i, SMALL_CHAR); > + do_test (2 * i, i, 8 << i, BIG_CHAR); > + do_test (i, i, 8 << i, SMALL_CHAR); > + do_test (i, i, 8 << i, BIG_CHAR); > + } > + > + do_zero_len_test (); > + do_random_tests (); > + > + return ret; > +} > + > +#include