mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 08:11:08 +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.
161 lines
3.8 KiB
C
161 lines
3.8 KiB
C
/* Measure STRLEN 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 TEST_MAIN
|
|
#ifndef WIDE
|
|
# define TEST_NAME "strlen"
|
|
#else
|
|
# define TEST_NAME "wcslen"
|
|
#endif
|
|
#include "bench-string.h"
|
|
|
|
#include "json-lib.h"
|
|
|
|
typedef size_t (*proto_t) (const CHAR *);
|
|
|
|
size_t generic_strlen (const CHAR *);
|
|
size_t memchr_strlen (const CHAR *);
|
|
|
|
IMPL (memchr_strlen, 0)
|
|
IMPL (generic_strlen, 0)
|
|
|
|
size_t
|
|
memchr_strlen (const CHAR *p)
|
|
{
|
|
return (const CHAR *)MEMCHR (p, 0, PTRDIFF_MAX) - p;
|
|
}
|
|
|
|
IMPL (STRLEN, 1)
|
|
|
|
|
|
static void
|
|
do_one_test (json_ctx_t *json_ctx, impl_t *impl, const CHAR *s, size_t exp_len)
|
|
{
|
|
size_t len = CALL (impl, s), i, iters = INNER_LOOP_ITERS;
|
|
timing_t start, stop, cur;
|
|
|
|
if (len != exp_len)
|
|
{
|
|
error (0, 0, "Wrong result in function %s %zd %zd", impl->name,
|
|
len, exp_len);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
TIMING_NOW (start);
|
|
for (i = 0; i < iters; ++i)
|
|
{
|
|
CALL (impl, s);
|
|
}
|
|
TIMING_NOW (stop);
|
|
|
|
TIMING_DIFF (cur, start, stop);
|
|
|
|
json_element_double (json_ctx, (double) cur / (double) iters);
|
|
}
|
|
|
|
static void
|
|
do_test (json_ctx_t *json_ctx, size_t align, size_t len)
|
|
{
|
|
size_t i;
|
|
|
|
align &= 63;
|
|
if (align + sizeof (CHAR) * len >= page_size)
|
|
return;
|
|
|
|
json_element_object_begin (json_ctx);
|
|
json_attr_uint (json_ctx, "length", len);
|
|
json_attr_uint (json_ctx, "alignment", align);
|
|
json_array_begin (json_ctx, "timings");
|
|
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
{
|
|
CHAR *buf = (CHAR *) (buf1);
|
|
|
|
for (i = 0; i < len; ++i)
|
|
buf[align + i] = 1 + 11111 * i % MAX_CHAR;
|
|
buf[align + len] = 0;
|
|
|
|
do_one_test (json_ctx, impl, (CHAR *) (buf + align), len);
|
|
alloc_bufs ();
|
|
}
|
|
|
|
json_array_end (json_ctx);
|
|
json_element_object_end (json_ctx);
|
|
}
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
json_ctx_t json_ctx;
|
|
size_t i;
|
|
|
|
test_init ();
|
|
|
|
json_init (&json_ctx, 0, stdout);
|
|
|
|
json_document_begin (&json_ctx);
|
|
json_attr_string (&json_ctx, "timing_type", TIMING_TYPE);
|
|
|
|
json_attr_object_begin (&json_ctx, "functions");
|
|
json_attr_object_begin (&json_ctx, TEST_NAME);
|
|
json_attr_string (&json_ctx, "bench-variant", "");
|
|
|
|
json_array_begin (&json_ctx, "ifuncs");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
json_element_string (&json_ctx, impl->name);
|
|
json_array_end (&json_ctx);
|
|
|
|
json_array_begin (&json_ctx, "results");
|
|
/* Checking with only 4 * N alignments for wcslen, other alignments are wrong for wchar_t type arrays*/
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (&json_ctx, sizeof (CHAR) * i, i);
|
|
do_test (&json_ctx, 0, i);
|
|
}
|
|
|
|
for (i = 2; i <= 12; ++i)
|
|
{
|
|
do_test (&json_ctx, 0, 1 << i);
|
|
do_test (&json_ctx, sizeof (CHAR) * 7, 1 << i);
|
|
do_test (&json_ctx, sizeof (CHAR) * i, 1 << i);
|
|
do_test (&json_ctx, sizeof (CHAR) * i, (size_t)((1 << i) / 1.5));
|
|
}
|
|
|
|
json_array_end (&json_ctx);
|
|
json_attr_object_end (&json_ctx);
|
|
json_attr_object_end (&json_ctx);
|
|
json_document_end (&json_ctx);
|
|
|
|
return ret;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|
|
|
|
#define libc_hidden_builtin_def(X)
|
|
#ifndef WIDE
|
|
# undef STRLEN
|
|
# define STRLEN generic_strlen
|
|
# include <string/strlen.c>
|
|
#else
|
|
# define WCSLEN generic_strlen
|
|
# include <wcsmbs/wcslen.c>
|
|
#endif
|