2002-11-07 19:15:01 +00:00
|
|
|
/* Test and measure strchr functions.
|
2003-04-17 17:38:38 +00:00
|
|
|
Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
|
2002-11-07 19:15:01 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
|
|
|
|
|
|
|
|
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, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
|
|
|
|
|
|
|
#define TEST_MAIN
|
|
|
|
#include "test-string.h"
|
|
|
|
|
|
|
|
typedef char *(*proto_t) (const char *, int);
|
|
|
|
char *simple_strchr (const char *, int);
|
2002-11-08 22:10:01 +00:00
|
|
|
char *stupid_strchr (const char *, int);
|
2002-11-07 19:15:01 +00:00
|
|
|
|
2002-11-08 22:10:01 +00:00
|
|
|
IMPL (stupid_strchr, 0)
|
2002-11-07 19:15:01 +00:00
|
|
|
IMPL (simple_strchr, 0)
|
|
|
|
IMPL (strchr, 1)
|
|
|
|
|
|
|
|
char *
|
|
|
|
simple_strchr (const char *s, int c)
|
|
|
|
{
|
|
|
|
for (; *s != (char) c; ++s)
|
|
|
|
if (*s == '\0')
|
2003-04-17 17:38:38 +00:00
|
|
|
return NULL;
|
2002-11-07 19:15:01 +00:00
|
|
|
return (char *) s;
|
|
|
|
}
|
|
|
|
|
2002-11-08 22:10:01 +00:00
|
|
|
char *
|
|
|
|
stupid_strchr (const char *s, int c)
|
|
|
|
{
|
|
|
|
size_t n = strlen (s) + 1;
|
|
|
|
|
|
|
|
while (n--)
|
|
|
|
if (*s++ == (char) c)
|
|
|
|
return (char *) s - 1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2002-11-07 19:15:01 +00:00
|
|
|
static void
|
|
|
|
do_one_test (impl_t *impl, const char *s, int c, char *exp_res)
|
|
|
|
{
|
|
|
|
char *res = CALL (impl, s, c);
|
|
|
|
if (res != exp_res)
|
|
|
|
{
|
|
|
|
error (0, 0, "Wrong result in function %s %p %p", impl->name,
|
|
|
|
res, exp_res);
|
|
|
|
ret = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (HP_TIMING_AVAIL)
|
|
|
|
{
|
2003-04-17 17:38:38 +00:00
|
|
|
hp_timing_t start __attribute ((unused));
|
|
|
|
hp_timing_t stop __attribute ((unused));
|
|
|
|
hp_timing_t best_time = ~ (hp_timing_t) 0;
|
2002-11-07 19:15:01 +00:00
|
|
|
size_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < 32; ++i)
|
|
|
|
{
|
|
|
|
HP_TIMING_NOW (start);
|
|
|
|
CALL (impl, s, c);
|
|
|
|
HP_TIMING_NOW (stop);
|
|
|
|
HP_TIMING_BEST (best_time, start, stop);
|
|
|
|
}
|
|
|
|
|
|
|
|
printf ("\t%zd", (size_t) best_time);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
char *result;
|
|
|
|
|
|
|
|
align &= 7;
|
|
|
|
if (align + len >= page_size)
|
|
|
|
return;
|
2003-04-17 17:38:38 +00:00
|
|
|
|
2002-11-07 19:15:01 +00:00
|
|
|
for (i = 0; i < len; ++i)
|
|
|
|
{
|
|
|
|
buf1[align + i] = 32 + 23 * i % (max_char - 32);
|
|
|
|
if (buf1[align + i] == seek_char)
|
|
|
|
buf1[align + i] = seek_char + 1;
|
|
|
|
}
|
|
|
|
buf1[align + len] = 0;
|
|
|
|
|
|
|
|
if (pos < len)
|
|
|
|
{
|
|
|
|
buf1[align + pos] = seek_char;
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
result = (char *) (buf1 + align + pos);
|
2002-11-07 19:15:01 +00:00
|
|
|
}
|
|
|
|
else if (seek_char == 0)
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
result = (char *) (buf1 + align + len);
|
2002-11-07 19:15:01 +00:00
|
|
|
else
|
|
|
|
result = NULL;
|
|
|
|
|
|
|
|
if (HP_TIMING_AVAIL)
|
|
|
|
printf ("Length %4zd, alignment %2zd:", pos, align);
|
|
|
|
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
do_one_test (impl, (char *) (buf1 + align), seek_char, result);
|
2002-11-07 19:15:01 +00:00
|
|
|
|
|
|
|
if (HP_TIMING_AVAIL)
|
|
|
|
putchar ('\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
do_random_tests (void)
|
|
|
|
{
|
|
|
|
size_t i, j, n, align, pos, len;
|
|
|
|
int seek_char;
|
|
|
|
char *result;
|
|
|
|
unsigned char *p = buf1 + page_size - 512;
|
|
|
|
|
|
|
|
for (n = 0; n < ITERATIONS; n++)
|
|
|
|
{
|
|
|
|
align = random () & 15;
|
|
|
|
pos = random () & 511;
|
2002-11-08 22:10:01 +00:00
|
|
|
seek_char = random () & 255;
|
2002-11-07 19:15:01 +00:00
|
|
|
if (pos + align >= 511)
|
|
|
|
pos = 510 - align - (random () & 7);
|
|
|
|
len = random () & 511;
|
2002-11-08 22:10:01 +00:00
|
|
|
if ((pos == len && seek_char)
|
|
|
|
|| (pos > len && (random () & 1)))
|
|
|
|
len = pos + 1 + (random () & 7);
|
2002-11-07 19:15:01 +00:00
|
|
|
if (len + align >= 512)
|
|
|
|
len = 511 - align - (random () & 7);
|
2002-11-08 22:10:01 +00:00
|
|
|
if (pos == len && seek_char)
|
|
|
|
len = pos + 1;
|
|
|
|
j = (pos > len ? pos : len) + align + 64;
|
2002-11-07 19:15:01 +00:00
|
|
|
if (j > 512)
|
|
|
|
j = 512;
|
|
|
|
|
|
|
|
for (i = 0; i < j; i++)
|
|
|
|
{
|
|
|
|
if (i == pos + align)
|
|
|
|
p[i] = seek_char;
|
|
|
|
else if (i == len + align)
|
|
|
|
p[i] = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p[i] = random () & 255;
|
|
|
|
if (i < pos + align && p[i] == seek_char)
|
|
|
|
p[i] = seek_char + 13;
|
|
|
|
if (i < len + align && !p[i])
|
|
|
|
{
|
|
|
|
p[i] = seek_char - 13;
|
|
|
|
if (!p[i])
|
|
|
|
p[i] = 140;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pos <= len)
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
result = (char *) (p + pos + align);
|
2002-11-07 19:15:01 +00:00
|
|
|
else if (seek_char == 0)
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
result = (char *) (p + len + align);
|
2002-11-07 19:15:01 +00:00
|
|
|
else
|
|
|
|
result = NULL;
|
|
|
|
|
|
|
|
FOR_EACH_IMPL (impl, 1)
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
if (CALL (impl, (char *) (p + align), seek_char) != result)
|
2002-11-07 19:15:01 +00:00
|
|
|
{
|
|
|
|
error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %d, %zd, %zd) %p != %p, p %p",
|
|
|
|
n, impl->name, align, seek_char, len, pos,
|
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise.
* posix/transbug.c (run_test): Add some casts.
* posix/bug-regex22.c (main): Likewise.
* posix/bug-regex5.c (main): Likewise.
* wcsmbs/tst-mbsrtowcs.c (main): Likewise.
* string/test-strspn.c (do_test, do_random_tests): Likewise.
* string/test-strrchr.c (do_test, do_random_tests): Likewise.
* string/test-strlen.c (do_random_tests): Likewise.
* string/test-strpbrk.c (do_test, do_random_tests): Likewise.
* string/test-strcmp.c (do_random_tests): Likewise.
* string/test-strchr.c (do_test, do_random_tests): Likewise.
* string/test-strcat.c (do_test, do_random_tests): Likewise.
* string/test-strncpy.c (do_random_tests): Likewise.
* string/test-strcpy.c (do_test, do_random_tests): Likewise.
* string/test-memccpy.c (do_test): Likewise.
* string/test-memmove.c (do_test, do_random_tests): Likewise.
* string/test-memcpy.c (do_test, do_random_tests): Likewise.
* string/test-memcmp.c (do_test, do_random_tests): Likewise.
* string/test-memchr.c (do_test, do_random_tests): Likewise.
* dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast.
* stdio-common/tst-fgets.c (do_test): Add a cast.
* iconvdata/bug-iconv4.c (xiconv): Add a cast.
* locale/programs/simple-hash.c (insert_entry_2): Remove useless casts.
* resolv/herror.c (herror): Remove unused extern decl.
* libio/obprintf.c: Include "strfile.h".
* elf/order2mod2.c (init): Cast ignored value to void.
* stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
2005-12-27 22:50:12 +00:00
|
|
|
CALL (impl, (char *) (p + align), seek_char), result, p);
|
2002-11-07 19:15:01 +00:00
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
test_main (void)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
test_init ();
|
|
|
|
|
|
|
|
printf ("%20s", "");
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
|
|
printf ("\t%s", impl->name);
|
|
|
|
putchar ('\n');
|
|
|
|
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
|
|
{
|
|
|
|
do_test (0, 16 << i, 2048, 23, 127);
|
|
|
|
do_test (i, 16 << i, 2048, 23, 127);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
|
|
{
|
|
|
|
do_test (i, 64, 256, 23, 127);
|
|
|
|
do_test (i, 64, 256, 23, 255);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 32; ++i)
|
|
|
|
{
|
|
|
|
do_test (0, i, i + 1, 23, 127);
|
|
|
|
do_test (0, i, i + 1, 23, 255);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
|
|
{
|
|
|
|
do_test (0, 16 << i, 2048, 0, 127);
|
|
|
|
do_test (i, 16 << i, 2048, 0, 127);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
|
|
{
|
|
|
|
do_test (i, 64, 256, 0, 127);
|
|
|
|
do_test (i, 64, 256, 0, 255);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 32; ++i)
|
|
|
|
{
|
|
|
|
do_test (0, i, i + 1, 0, 127);
|
|
|
|
do_test (0, i, i + 1, 0, 255);
|
|
|
|
}
|
|
|
|
|
|
|
|
do_random_tests ();
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#include "../test-skeleton.c"
|