2016-12-09 15:18:27 +08:00
|
|
|
# Makefile for support library, used only at build and test time
|
2019-01-01 08:11:28 +08:00
|
|
|
# Copyright (C) 2016-2019 Free Software Foundation, Inc.
|
2016-12-09 15:18:27 +08:00
|
|
|
# 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/>.
|
|
|
|
|
|
|
|
subdir := support
|
|
|
|
|
|
|
|
include ../Makeconfig
|
|
|
|
|
|
|
|
extra-libs := libsupport
|
|
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
extra-libs-noinstall := $(extra-libs)
|
|
|
|
|
|
|
|
libsupport-routines = \
|
2018-10-30 20:11:47 +08:00
|
|
|
blob_repeat \
|
2016-12-09 15:18:27 +08:00
|
|
|
check \
|
2016-12-31 21:06:16 +08:00
|
|
|
check_addrinfo \
|
|
|
|
check_dns_packet \
|
|
|
|
check_hostent \
|
|
|
|
check_netent \
|
2016-12-09 15:18:27 +08:00
|
|
|
delayed_exit \
|
|
|
|
ignore_stderr \
|
2017-11-14 00:55:12 +08:00
|
|
|
next_to_fault \
|
2016-12-09 15:18:27 +08:00
|
|
|
oom_error \
|
2016-12-31 21:06:16 +08:00
|
|
|
resolv_test \
|
2016-12-09 15:18:27 +08:00
|
|
|
set_fortify_handler \
|
2017-12-22 17:55:40 +08:00
|
|
|
support-xfstat \
|
2017-06-02 21:50:36 +08:00
|
|
|
support-xstat \
|
2017-01-01 01:51:07 +08:00
|
|
|
support_become_root \
|
2017-06-02 21:50:36 +08:00
|
|
|
support_can_chroot \
|
2017-06-02 17:59:28 +08:00
|
|
|
support_capture_subprocess \
|
2017-06-02 21:50:36 +08:00
|
|
|
support_capture_subprocess_check \
|
2017-07-05 21:38:42 +08:00
|
|
|
support_chroot \
|
2018-09-01 04:07:47 +08:00
|
|
|
support_copy_file_range \
|
2018-08-21 18:56:53 +08:00
|
|
|
support_descriptor_supports_holes \
|
2018-12-06 22:39:42 +08:00
|
|
|
support_descriptors \
|
2017-11-18 21:30:20 +08:00
|
|
|
support_enter_mount_namespace \
|
2017-01-01 01:51:07 +08:00
|
|
|
support_enter_network_namespace \
|
2016-12-31 21:06:16 +08:00
|
|
|
support_format_address_family \
|
|
|
|
support_format_addrinfo \
|
|
|
|
support_format_dns_packet \
|
|
|
|
support_format_herrno \
|
|
|
|
support_format_hostent \
|
|
|
|
support_format_netent \
|
2017-06-02 21:50:36 +08:00
|
|
|
support_isolate_in_subprocess \
|
[BZ 1190] Make EOF sticky in stdio.
C99 specifies that the EOF condition on a file is "sticky": once EOF
has been encountered, all subsequent reads should continue to return
EOF until the file is closed or something clears the "end-of-file
indicator" (e.g. fseek, clearerr). This is arguably a change from
C89, where the wording was ambiguous; the BSDs always had sticky EOF,
but the System V lineage would attempt to read from the underlying fd
again. GNU libc has followed System V for as long as we've been
using libio, but nowadays C99 conformance and BSD compatibility are
more important than System V compatibility.
You might wonder if changing the _underflow impls is sufficient to
apply the C99 semantics to all of the many stdio functions that
perform input. It should be enough to cover all paths to _IO_SYSREAD,
and the only other functions that call _IO_SYSREAD are the _seekoff
impls, which is OK because seeking clears EOF, and the _xsgetn impls,
which, as far as I can tell, are unused within glibc.
The test programs in this patch use a pseudoterminal to set up the
necessary conditions. To facilitate this I added a new test-support
function that sets up a pair of pty file descriptors for you; it's
almost the same as BSD openpty, the only differences are that it
allocates the optionally-returned tty pathname with malloc, and that
it crashes if anything goes wrong.
[BZ #1190]
[BZ #19476]
* libio/fileops.c (_IO_new_file_underflow): Return EOF immediately
if the _IO_EOF_SEEN bit is already set; update commentary.
* libio/oldfileops.c (_IO_old_file_underflow): Likewise.
* libio/wfileops.c (_IO_wfile_underflow): Likewise.
* support/support_openpty.c, support/tty.h: New files.
* support/Makefile (libsupport-routines): Add support_openpty.
* libio/tst-fgetc-after-eof.c, wcsmbs/test-fgetwc-after-eof.c:
New test cases.
* libio/Makefile (tests): Add tst-fgetc-after-eof.
* wcsmbs/Makefile (tests): Add tst-fgetwc-after-eof.
2018-02-22 08:12:51 +08:00
|
|
|
support_openpty \
|
2018-07-06 13:10:41 +08:00
|
|
|
support_paths \
|
2018-05-16 23:00:35 +08:00
|
|
|
support_quote_blob \
|
2018-11-28 04:35:56 +08:00
|
|
|
support_quote_string \
|
2016-12-28 20:37:18 +08:00
|
|
|
support_record_failure \
|
2016-12-31 21:06:16 +08:00
|
|
|
support_run_diff \
|
2017-06-02 21:50:36 +08:00
|
|
|
support_shared_allocate \
|
2018-05-16 23:00:35 +08:00
|
|
|
support_test_compare_blob \
|
2017-12-05 03:54:24 +08:00
|
|
|
support_test_compare_failure \
|
2018-11-07 19:42:44 +08:00
|
|
|
support_test_compare_string \
|
2017-06-02 21:50:36 +08:00
|
|
|
support_write_file_string \
|
2016-12-09 15:18:27 +08:00
|
|
|
support_test_main \
|
2016-12-28 20:37:18 +08:00
|
|
|
support_test_verify_impl \
|
2016-12-09 15:18:27 +08:00
|
|
|
temp_file \
|
|
|
|
write_message \
|
2016-12-31 21:06:16 +08:00
|
|
|
xaccept \
|
2017-04-19 13:44:48 +08:00
|
|
|
xaccept4 \
|
2016-12-09 15:18:27 +08:00
|
|
|
xasprintf \
|
2016-12-31 21:06:16 +08:00
|
|
|
xbind \
|
2016-12-09 15:18:27 +08:00
|
|
|
xcalloc \
|
2017-06-02 21:50:36 +08:00
|
|
|
xchroot \
|
2017-03-15 20:13:58 +08:00
|
|
|
xclose \
|
2016-12-31 21:06:16 +08:00
|
|
|
xconnect \
|
2018-09-01 04:07:47 +08:00
|
|
|
xcopy_file_range \
|
2017-09-21 10:37:45 +08:00
|
|
|
xdlfcn \
|
2017-06-02 17:59:28 +08:00
|
|
|
xdup2 \
|
2016-12-31 21:06:16 +08:00
|
|
|
xfclose \
|
|
|
|
xfopen \
|
2016-12-28 20:37:18 +08:00
|
|
|
xfork \
|
2017-12-22 17:55:40 +08:00
|
|
|
xftruncate \
|
2016-12-31 21:06:16 +08:00
|
|
|
xgetsockname \
|
|
|
|
xlisten \
|
2017-12-22 17:55:40 +08:00
|
|
|
xlseek \
|
2016-12-09 15:18:27 +08:00
|
|
|
xmalloc \
|
2016-12-31 21:06:16 +08:00
|
|
|
xmemstream \
|
2017-06-02 21:50:36 +08:00
|
|
|
xmkdir \
|
2018-07-06 13:10:41 +08:00
|
|
|
xmkdirp \
|
2017-01-27 13:53:19 +08:00
|
|
|
xmmap \
|
2017-06-21 19:09:08 +08:00
|
|
|
xmprotect \
|
2017-01-27 13:53:19 +08:00
|
|
|
xmunmap \
|
2017-06-02 21:50:36 +08:00
|
|
|
xopen \
|
2017-06-02 17:59:28 +08:00
|
|
|
xpipe \
|
2016-12-31 21:06:16 +08:00
|
|
|
xpoll \
|
2019-02-06 16:06:34 +08:00
|
|
|
xposix_memalign \
|
2017-01-29 08:13:34 +08:00
|
|
|
xpthread_attr_destroy \
|
|
|
|
xpthread_attr_init \
|
|
|
|
xpthread_attr_setdetachstate \
|
nptl: Invert the mmap/mprotect logic on allocated stacks (BZ#18988)
Current allocate_stack logic for create stacks is to first mmap all
the required memory with the desirable memory and then mprotect the
guard area with PROT_NONE if required. Although it works as expected,
it pessimizes the allocation because it requires the kernel to actually
increase commit charge (it counts against the available physical/swap
memory available for the system).
The only issue is to actually check this change since side-effects are
really Linux specific and to actually account them it would require a
kernel specific tests to parse the system wide information. On the kernel
I checked /proc/self/statm does not show any meaningful difference for
vmm and/or rss before and after thread creation. I could only see
really meaningful information checking on system wide /proc/meminfo
between thread creation: MemFree, MemAvailable, and Committed_AS shows
large difference without the patch. I think trying to use these
kind of information on a testcase is fragile.
The BZ#18988 reports shows that the commit pages are easily seen with
mlockall (MCL_FUTURE) (with lock all pages that become mapped in the
process) however a more straighfoward testcase shows that pthread_create
could be faster using this patch:
--
static const int inner_count = 256;
static const int outer_count = 128;
static
void *thread1(void *arg)
{
return NULL;
}
static
void *sleeper(void *arg)
{
pthread_t ts[inner_count];
for (int i = 0; i < inner_count; i++)
pthread_create (&ts[i], &a, thread1, NULL);
for (int i = 0; i < inner_count; i++)
pthread_join (ts[i], NULL);
return NULL;
}
int main(void)
{
pthread_attr_init(&a);
pthread_attr_setguardsize(&a, 1<<20);
pthread_attr_setstacksize(&a, 1134592);
pthread_t ts[outer_count];
for (int i = 0; i < outer_count; i++)
pthread_create(&ts[i], &a, sleeper, NULL);
for (int i = 0; i < outer_count; i++)
pthread_join(ts[i], NULL);
assert(r == 0);
}
return 0;
}
--
On x86_64 (4.4.0-45-generic, gcc 5.4.0) running the small benchtests
I see:
$ time ./test
real 0m3.647s
user 0m0.080s
sys 0m11.836s
While with the patch I see:
$ time ./test
real 0m0.696s
user 0m0.040s
sys 0m1.152s
So I added a pthread_create benchtest (thread_create) which check
the thread creation latency. As for the simple benchtests, I saw
improvements in thread creation on all architectures I tested the
change.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, powerpc64le-linux-gnu, sparc64-linux-gnu,
and sparcv9-linux-gnu.
[BZ #18988]
* benchtests/thread_create-inputs: New file.
* benchtests/thread_create-source.c: Likewise.
* support/xpthread_attr_setguardsize.c: Likewise.
* support/Makefile (libsupport-routines): Add
xpthread_attr_setguardsize object.
* support/xthread.h: Add xpthread_attr_setguardsize prototype.
* benchtests/Makefile (bench-pthread): Add thread_create.
* nptl/allocatestack.c (allocate_stack): Call mmap with PROT_NONE and
then mprotect the required area.
2017-02-01 04:01:59 +08:00
|
|
|
xpthread_attr_setguardsize \
|
2019-02-06 16:06:34 +08:00
|
|
|
xpthread_attr_setstack \
|
2017-12-05 22:20:30 +08:00
|
|
|
xpthread_attr_setstacksize \
|
2016-12-09 15:18:27 +08:00
|
|
|
xpthread_barrier_destroy \
|
|
|
|
xpthread_barrier_init \
|
|
|
|
xpthread_barrier_wait \
|
2018-05-29 16:48:46 +08:00
|
|
|
xpthread_barrierattr_destroy \
|
|
|
|
xpthread_barrierattr_init \
|
|
|
|
xpthread_barrierattr_setpshared \
|
2016-12-09 15:18:27 +08:00
|
|
|
xpthread_cancel \
|
|
|
|
xpthread_check_return \
|
|
|
|
xpthread_cond_wait \
|
|
|
|
xpthread_create \
|
|
|
|
xpthread_detach \
|
|
|
|
xpthread_join \
|
2017-01-27 13:53:19 +08:00
|
|
|
xpthread_mutex_consistent \
|
|
|
|
xpthread_mutex_destroy \
|
|
|
|
xpthread_mutex_init \
|
2016-12-09 15:18:27 +08:00
|
|
|
xpthread_mutex_lock \
|
|
|
|
xpthread_mutex_unlock \
|
2017-01-27 13:53:19 +08:00
|
|
|
xpthread_mutexattr_destroy \
|
|
|
|
xpthread_mutexattr_init \
|
|
|
|
xpthread_mutexattr_setprotocol \
|
|
|
|
xpthread_mutexattr_setpshared \
|
|
|
|
xpthread_mutexattr_setrobust \
|
|
|
|
xpthread_mutexattr_settype \
|
2016-12-31 21:06:16 +08:00
|
|
|
xpthread_once \
|
2017-07-28 12:22:44 +08:00
|
|
|
xpthread_rwlock_init \
|
2019-01-22 11:50:12 +08:00
|
|
|
xpthread_rwlock_destroy \
|
2017-07-28 12:22:44 +08:00
|
|
|
xpthread_rwlock_rdlock \
|
|
|
|
xpthread_rwlock_unlock \
|
2017-11-12 16:53:06 +08:00
|
|
|
xpthread_rwlock_wrlock \
|
2017-07-28 12:22:44 +08:00
|
|
|
xpthread_rwlockattr_init \
|
|
|
|
xpthread_rwlockattr_setkind_np \
|
2016-12-09 15:18:27 +08:00
|
|
|
xpthread_sigmask \
|
|
|
|
xpthread_spin_lock \
|
|
|
|
xpthread_spin_unlock \
|
2017-12-05 22:20:30 +08:00
|
|
|
xraise \
|
2017-11-12 16:53:06 +08:00
|
|
|
xreadlink \
|
2016-12-09 15:18:27 +08:00
|
|
|
xrealloc \
|
2016-12-31 21:06:16 +08:00
|
|
|
xrecvfrom \
|
|
|
|
xsendto \
|
|
|
|
xsetsockopt \
|
2017-12-05 22:20:30 +08:00
|
|
|
xsigaction \
|
|
|
|
xsignal \
|
2019-01-16 03:58:15 +08:00
|
|
|
xsigstack \
|
2017-01-01 01:51:07 +08:00
|
|
|
xsocket \
|
2016-12-31 21:06:16 +08:00
|
|
|
xstrdup \
|
2017-11-12 16:53:06 +08:00
|
|
|
xstrndup \
|
2018-07-06 13:10:41 +08:00
|
|
|
xsymlink \
|
2017-12-05 22:20:30 +08:00
|
|
|
xsysconf \
|
2017-11-12 16:53:06 +08:00
|
|
|
xunlink \
|
2016-12-28 20:37:18 +08:00
|
|
|
xwaitpid \
|
2016-12-31 21:06:16 +08:00
|
|
|
xwrite \
|
2016-12-09 15:18:27 +08:00
|
|
|
|
|
|
|
libsupport-static-only-routines := $(libsupport-routines)
|
|
|
|
# Only build one variant of the library.
|
|
|
|
libsupport-inhibit-o := .os
|
|
|
|
ifeq ($(build-shared),yes)
|
|
|
|
libsupport-inhibit-o += .o
|
|
|
|
endif
|
|
|
|
|
2018-07-06 13:10:41 +08:00
|
|
|
CFLAGS-support_paths.c = \
|
|
|
|
-DSRCDIR_PATH=\"`cd .. ; pwd`\" \
|
|
|
|
-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
|
2018-10-04 19:07:29 +08:00
|
|
|
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
|
2018-07-06 13:10:41 +08:00
|
|
|
-DINSTDIR_PATH=\"$(prefix)\" \
|
|
|
|
-DLIBDIR_PATH=\"$(libdir)\"
|
|
|
|
|
|
|
|
ifeq (,$(CXX))
|
|
|
|
LINKS_DSO_PROGRAM = links-dso-program-c
|
|
|
|
else
|
|
|
|
LINKS_DSO_PROGRAM = links-dso-program
|
2018-08-25 10:07:23 +08:00
|
|
|
LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)
|
2018-07-06 13:10:41 +08:00
|
|
|
endif
|
|
|
|
|
|
|
|
LDLIBS-test-container = $(libsupport)
|
|
|
|
|
|
|
|
others += test-container
|
|
|
|
others-noinstall += test-container
|
|
|
|
|
|
|
|
others += shell-container echo-container true-container
|
|
|
|
others-noinstall += shell-container echo-container true-container
|
|
|
|
|
|
|
|
others += $(LINKS_DSO_PROGRAM)
|
|
|
|
others-noinstall += $(LINKS_DSO_PROGRAM)
|
|
|
|
|
|
|
|
$(objpfx)test-container : $(libsupport)
|
|
|
|
$(objpfx)shell-container : $(libsupport)
|
|
|
|
$(objpfx)echo-container : $(libsupport)
|
|
|
|
$(objpfx)true-container : $(libsupport)
|
|
|
|
|
2016-12-28 20:37:18 +08:00
|
|
|
tests = \
|
|
|
|
README-testing \
|
2017-01-01 01:51:07 +08:00
|
|
|
tst-support-namespace \
|
2018-10-30 20:11:47 +08:00
|
|
|
tst-support_blob_repeat \
|
2017-06-02 17:59:28 +08:00
|
|
|
tst-support_capture_subprocess \
|
2018-12-06 22:39:42 +08:00
|
|
|
tst-support_descriptors \
|
2017-03-15 19:57:12 +08:00
|
|
|
tst-support_format_dns_packet \
|
2018-05-16 23:00:35 +08:00
|
|
|
tst-support_quote_blob \
|
2018-11-28 04:35:56 +08:00
|
|
|
tst-support_quote_string \
|
2016-12-28 20:37:18 +08:00
|
|
|
tst-support_record_failure \
|
2017-12-05 03:54:24 +08:00
|
|
|
tst-test_compare \
|
2018-05-16 23:00:35 +08:00
|
|
|
tst-test_compare_blob \
|
2018-11-07 19:42:44 +08:00
|
|
|
tst-test_compare_string \
|
2017-11-12 16:53:06 +08:00
|
|
|
tst-xreadlink \
|
2019-01-16 03:58:15 +08:00
|
|
|
tst-xsigstack \
|
2016-12-28 20:37:18 +08:00
|
|
|
|
2016-12-30 21:01:44 +08:00
|
|
|
ifeq ($(run-built-tests),yes)
|
2016-12-28 20:37:18 +08:00
|
|
|
tests-special = \
|
|
|
|
$(objpfx)tst-support_record_failure-2.out
|
|
|
|
|
|
|
|
$(objpfx)tst-support_record_failure-2.out: tst-support_record_failure-2.sh \
|
|
|
|
$(objpfx)tst-support_record_failure
|
|
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \
|
|
|
|
'$(run-program-env)' '$(test-program-prefix-after-env)' \
|
|
|
|
> $@; \
|
|
|
|
$(evaluate-test)
|
2016-12-30 21:01:44 +08:00
|
|
|
endif
|
2016-12-09 15:18:27 +08:00
|
|
|
|
2017-03-15 19:57:12 +08:00
|
|
|
$(objpfx)tst-support_format_dns_packet: $(common-objpfx)resolv/libresolv.so
|
|
|
|
|
2016-12-09 15:18:27 +08:00
|
|
|
include ../Rules
|