mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
c4f50205e1
This patch fixes various places where a space should have been present before '(' in accordance with the GNU Coding Standards. Most but not all of the fixes in this patch are for calls to sizeof (but it's not exhaustive regarding such calls that should be fixed). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-strcpy.c (do_test): Use space before '('. * benchtests/bench-string.h (cmdline_process_function): Likewise. * benchtests/bench-strlen.c (do_test): Likewise. (test_main): Likewise. * catgets/gencat.c (read_old): Likewise. * elf/cache.c (load_aux_cache): Likewise. * iconvdata/bug-iconv8.c (do_test): Likewise. * math/test-tgmath-ret.c (do_test): Likewise. * nis/nis_call.c (rec_dirsearch): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nptl/tst-audit-threads.c (do_test): Likewise. * nptl/tst-cancel4-common.h (set_socket_buffer): Likewise. * nss/nss_test1.c (init): Likewise. * nss/test-netdb.c (test_hosts): Likewise. * posix/execvpe.c (maybe_script_execute): Likewise. * stdio-common/tst-fmemopen4.c (do_test): Likewise. * stdio-common/tst-printf.c (do_test): Likewise. * stdio-common/vfscanf-internal.c (__vfscanf_internal): Likewise. * stdlib/fmtmsg.c (NKEYWORDS): Likewise. * stdlib/qsort.c (STACK_SIZE): Likewise. * stdlib/test-canon.c (do_test): Likewise. * stdlib/tst-swapcontext1.c (do_test): Likewise. * string/memcmp.c (OPSIZ): Likewise. * string/test-strcpy.c (do_test): Likewise. (do_random_tests): Likewise. * string/test-strlen.c (do_test): Likewise. (test_main): Likewise. * string/test-strrchr.c (do_test): Likewise. (do_random_tests): Likewise. * string/tester.c (test_memrchr): Likewise. (test_memchr): Likewise. * sysdeps/generic/memcopy.h (OPSIZ): Likewise. * sysdeps/generic/unwind-dw2.c (execute_stack_op): Likewise. * sysdeps/generic/unwind-pe.h (read_sleb128): Likewise. (read_encoded_value_with_base): Likewise. * sysdeps/hppa/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/hppa/fpu/feupdateenv.c (__feupdateenv): Likewise. * sysdeps/ia64/fpu/sfp-machine.h (TI_BITS): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/posix/spawni.c (maybe_script_execute): Likewise. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (query_auxv): Likewise. * sysdeps/unix/sysv/linux/aarch64/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/ioperm.c (init_iosys): Likewise. * sysdeps/unix/sysv/linux/csky/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/nios2/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/spawni.c (maybe_script_execute): Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/x86/bits/sigcontext.h (FP_XSTATE_MAGIC2_SIZE): Likewise. * sysdeps/x86/fpu/sfp-machine.h (TI_BITS): Likewise. * time/test_time.c (main): Likewise.
182 lines
4.3 KiB
C
182 lines
4.3 KiB
C
/* Measure strcpy functions.
|
|
Copyright (C) 2013-2019 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#define BIG_CHAR MAX_CHAR
|
|
|
|
#ifdef WIDE
|
|
# define sfmt "ls"
|
|
# define SMALL_CHAR 1273
|
|
#else
|
|
# define sfmt "s"
|
|
# define SMALL_CHAR 127
|
|
#endif
|
|
|
|
#ifndef STRCPY_RESULT
|
|
# define STRCPY_RESULT(dst, len) dst
|
|
# define TEST_MAIN
|
|
# ifndef WIDE
|
|
# define TEST_NAME "strcpy"
|
|
# else
|
|
# define TEST_NAME "wcscpy"
|
|
# endif
|
|
# include "bench-string.h"
|
|
# ifndef WIDE
|
|
# define SIMPLE_STRCPY simple_strcpy
|
|
# else
|
|
# define SIMPLE_STRCPY simple_wcscpy
|
|
# endif
|
|
|
|
CHAR *SIMPLE_STRCPY (CHAR *, const CHAR *);
|
|
|
|
IMPL (SIMPLE_STRCPY, 0)
|
|
IMPL (STRCPY, 1)
|
|
|
|
CHAR *
|
|
SIMPLE_STRCPY (CHAR *dst, const CHAR *src)
|
|
{
|
|
CHAR *ret = dst;
|
|
while ((*dst++ = *src++) != '\0');
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
typedef CHAR *(*proto_t) (CHAR *, const CHAR *);
|
|
|
|
static void
|
|
do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
|
|
size_t len __attribute__((unused)))
|
|
{
|
|
size_t i, iters = INNER_LOOP_ITERS;
|
|
timing_t start, stop, cur;
|
|
|
|
if (CALL (impl, dst, src) != STRCPY_RESULT (dst, len))
|
|
{
|
|
error (0, 0, "Wrong result in function %s %p %p", impl->name,
|
|
CALL (impl, dst, src), STRCPY_RESULT (dst, len));
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
if (STRCMP (dst, src) != 0)
|
|
{
|
|
error (0, 0,
|
|
"Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"",
|
|
impl->name, dst, src);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
TIMING_NOW (start);
|
|
for (i = 0; i < iters; ++i)
|
|
{
|
|
CALL (impl, dst, src);
|
|
}
|
|
TIMING_NOW (stop);
|
|
|
|
TIMING_DIFF (cur, start, stop);
|
|
|
|
TIMING_PRINT_MEAN ((double) cur, (double) iters);
|
|
}
|
|
|
|
static void
|
|
do_test (size_t align1, size_t align2, size_t len, int max_char)
|
|
{
|
|
size_t i;
|
|
CHAR *s1, *s2;
|
|
/* For wcscpy: 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;
|
|
s2 = (CHAR *) (buf2) + align2;
|
|
|
|
for (i = 0; i < len; i++)
|
|
s1[i] = 32 + 23 * i % (max_char - 32);
|
|
s1[len] = 0;
|
|
|
|
printf ("Length %4zd, alignments in bytes %2zd/%2zd:", len,
|
|
align1 * sizeof (CHAR), align2 * sizeof (CHAR));
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
do_one_test (impl, s2, s1, len);
|
|
|
|
putchar ('\n');
|
|
}
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
size_t i;
|
|
|
|
test_init ();
|
|
|
|
printf ("%23s", "");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
printf ("\t%s", impl->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);
|
|
}
|
|
|
|
for (i = 16; i <= 512; i+=4)
|
|
{
|
|
do_test (0, 4, i, SMALL_CHAR);
|
|
do_test (4, 0, i, BIG_CHAR);
|
|
do_test (4, 4, i, SMALL_CHAR);
|
|
do_test (2, 2, i, BIG_CHAR);
|
|
do_test (2, 6, i, SMALL_CHAR);
|
|
do_test (6, 2, i, BIG_CHAR);
|
|
do_test (1, 7, i, SMALL_CHAR);
|
|
do_test (7, 1, i, BIG_CHAR);
|
|
do_test (3, 4, i, SMALL_CHAR);
|
|
do_test (4, 3, i, BIG_CHAR);
|
|
do_test (5, 7, i, SMALL_CHAR);
|
|
do_test (7, 5, i, SMALL_CHAR);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|