2016-12-09 07:18:27 +00:00
|
|
|
# Makefile for support library, used only at build and test time
|
2023-01-06 21:08:04 +00:00
|
|
|
# Copyright (C) 2016-2023 Free Software Foundation, Inc.
|
2016-12-09 07:18:27 +00: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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
# <https://www.gnu.org/licenses/>.
|
2016-12-09 07:18:27 +00:00
|
|
|
|
|
|
|
subdir := support
|
|
|
|
|
|
|
|
include ../Makeconfig
|
|
|
|
|
|
|
|
extra-libs := libsupport
|
|
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
extra-libs-noinstall := $(extra-libs)
|
|
|
|
|
|
|
|
libsupport-routines = \
|
2018-10-30 12:11:47 +00:00
|
|
|
blob_repeat \
|
2016-12-09 07:18:27 +00:00
|
|
|
check \
|
2016-12-31 13:06:16 +00:00
|
|
|
check_addrinfo \
|
|
|
|
check_dns_packet \
|
|
|
|
check_hostent \
|
|
|
|
check_netent \
|
2016-12-09 07:18:27 +00:00
|
|
|
delayed_exit \
|
2023-03-07 12:30:02 +00:00
|
|
|
dtotimespec \
|
|
|
|
dtotimespec-time64 \
|
2016-12-09 07:18:27 +00:00
|
|
|
ignore_stderr \
|
2017-11-13 16:55:12 +00:00
|
|
|
next_to_fault \
|
2016-12-09 07:18:27 +00:00
|
|
|
oom_error \
|
2020-10-14 08:54:39 +00:00
|
|
|
resolv_response_context_duplicate \
|
|
|
|
resolv_response_context_free \
|
2016-12-31 13:06:16 +00:00
|
|
|
resolv_test \
|
2016-12-09 07:18:27 +00:00
|
|
|
set_fortify_handler \
|
2023-05-23 12:34:56 +00:00
|
|
|
support-open-dev-null-range \
|
2017-12-22 09:55:40 +00:00
|
|
|
support-xfstat \
|
2021-02-26 12:59:27 +00:00
|
|
|
support-xfstat-time64 \
|
2017-06-02 13:50:36 +00:00
|
|
|
support-xstat \
|
2021-02-26 12:59:27 +00:00
|
|
|
support-xstat-time64 \
|
2016-12-31 17:51:07 +00:00
|
|
|
support_become_root \
|
2017-06-02 13:50:36 +00:00
|
|
|
support_can_chroot \
|
2017-06-02 09:59:28 +00:00
|
|
|
support_capture_subprocess \
|
2017-06-02 13:50:36 +00:00
|
|
|
support_capture_subprocess_check \
|
2017-07-05 13:38:42 +00:00
|
|
|
support_chroot \
|
2020-11-26 15:59:44 +00:00
|
|
|
support_copy_file \
|
2018-08-31 20:07:47 +00:00
|
|
|
support_copy_file_range \
|
2021-06-16 16:44:03 +00:00
|
|
|
support_create_timer \
|
2018-08-21 10:56:53 +00:00
|
|
|
support_descriptor_supports_holes \
|
2018-12-06 14:39:42 +00:00
|
|
|
support_descriptors \
|
2017-11-18 13:30:20 +00:00
|
|
|
support_enter_mount_namespace \
|
2016-12-31 17:51:07 +00:00
|
|
|
support_enter_network_namespace \
|
2016-12-31 13:06:16 +00:00
|
|
|
support_format_address_family \
|
|
|
|
support_format_addrinfo \
|
|
|
|
support_format_dns_packet \
|
|
|
|
support_format_herrno \
|
|
|
|
support_format_hostent \
|
|
|
|
support_format_netent \
|
2017-06-02 13:50:36 +00:00
|
|
|
support_isolate_in_subprocess \
|
2021-08-11 18:16:51 +00:00
|
|
|
support_mutex_pi_monotonic \
|
2022-03-29 03:53:33 +00:00
|
|
|
support_need_proc \
|
2023-05-23 12:34:56 +00:00
|
|
|
support_openpty \
|
io: Return UNSUPPORTED if filesystem do not support 64 bit timestamps
Some Linux filesystems might not fully support 64 bit timestamps [1],
which make some Linux specific tests to fail when they check for the
functionality.
This patch adds a new libsupport function, support_path_support_time64,
that returns whether the target file supports or not 64 bit timestamps.
The support is checked by issuing a utimensat and verifying both the
last access and last modification time against a statx call.
The tests that might fail are also adjusted to check the file support
as well:
$ dd if=/dev/zero of=loopbackfile.img bs=100M count=1
1+0 records in
1+0 records out
104857600 bytes (105 MB, 100 MiB) copied, 0,0589568 s, 1,8 GB/s
$ sudo losetup -fP loopbackfile.img
$ mkfs.xfs loopbackfile.img
meta-data=loopbackfile.img isize=512 agcount=4, agsize=6400 blks
= sectsz=512 attr=2, projid32bit=1
= crc=1 finobt=1, sparse=1, rmapbt=0
= reflink=1
data = bsize=4096 blocks=25600, imaxpct=25
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0, ftype=1
log =internal log bsize=4096 blocks=1368, version=2
= sectsz=512 sunit=0 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0
$ mkdir loopfs
$ sudo mount -o loop /dev/loop0 loopfs/
$ sudo chown -R azanella:azanella loopfs
$ TMPDIR=loopfs/ ./testrun.sh misc/tst-utimes
error: ../sysdeps/unix/sysv/linux/tst-utimes.c:55: File loopfs//utimesfECsK1 does not support 64-bit timestamps
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1795576
2021-03-11 12:30:33 +00:00
|
|
|
support_path_support_time64 \
|
2023-05-23 12:34:56 +00:00
|
|
|
support_paths \
|
2019-11-19 20:17:05 +00:00
|
|
|
support_process_state \
|
2019-09-18 10:40:00 +00:00
|
|
|
support_ptrace \
|
2018-05-16 15:00:35 +00:00
|
|
|
support_quote_blob \
|
2021-10-12 13:48:39 +00:00
|
|
|
support_quote_blob_wide \
|
2018-11-27 20:35:56 +00:00
|
|
|
support_quote_string \
|
2016-12-28 12:37:18 +00:00
|
|
|
support_record_failure \
|
2016-12-31 13:06:16 +00:00
|
|
|
support_run_diff \
|
2021-04-09 13:02:30 +00:00
|
|
|
support_select_modifies_timeout \
|
2021-04-09 13:05:13 +00:00
|
|
|
support_select_normalizes_timeout \
|
2019-11-11 08:20:09 +00:00
|
|
|
support_set_small_thread_stack_size \
|
2017-06-02 13:50:36 +00:00
|
|
|
support_shared_allocate \
|
2019-11-11 08:20:09 +00:00
|
|
|
support_small_stack_thread_attribute \
|
2021-12-13 14:36:42 +00:00
|
|
|
support_socket_so_timestamp_time64 \
|
2023-05-23 12:34:56 +00:00
|
|
|
support_stack_alloc \
|
2021-03-17 13:03:52 +00:00
|
|
|
support_stat_nanoseconds \
|
support: Add support_capture_subprogram
Its API is similar to support_capture_subprocess, but rather creates a
new process based on the input path and arguments. Under the hoods it
uses posix_spawn to create the new process.
It also allows the use of other support_capture_* functions to check
for expected results and free the resources.
Checked on x86_64-linux-gnu.
* support/Makefile (libsupport-routines): Add support_subprocess,
xposix_spawn, xposix_spawn_file_actions_addclose, and
xposix_spawn_file_actions_adddup2.
(tst-support_capture_subprocess-ARGS): New rule.
* support/capture_subprocess.h (support_capture_subprogram): New
prototype.
* support/support_capture_subprocess.c (support_capture_subprocess):
Refactor to use support_subprocess and support_capture_poll.
(support_capture_subprogram): New function.
* support/tst-support_capture_subprocess.c (write_mode_to_str,
str_to_write_mode, test_common, parse_int, handle_restart,
do_subprocess, do_subprogram, do_multiple_tests): New functions.
(do_test): Add support_capture_subprogram tests.
* support/subprocess.h: New file.
* support/support_subprocess.c: Likewise.
* support/xposix_spawn.c: Likewise.
* support/xposix_spawn_file_actions_addclose.c: Likewise.
* support/xposix_spawn_file_actions_adddup2.c: Likewise.
* support/xspawn.h: Likewise.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2019-04-12 20:39:53 +00:00
|
|
|
support_subprocess \
|
2018-05-16 15:00:35 +00:00
|
|
|
support_test_compare_blob \
|
2017-12-04 19:54:24 +00:00
|
|
|
support_test_compare_failure \
|
2018-11-07 11:42:44 +00:00
|
|
|
support_test_compare_string \
|
2021-10-12 13:48:39 +00:00
|
|
|
support_test_compare_string_wide \
|
2016-12-09 07:18:27 +00:00
|
|
|
support_test_main \
|
2016-12-28 12:37:18 +00:00
|
|
|
support_test_verify_impl \
|
2021-08-30 11:43:56 +00:00
|
|
|
support_wait_for_thread_exit \
|
|
|
|
support_write_file_string \
|
2016-12-09 07:18:27 +00:00
|
|
|
temp_file \
|
2019-05-09 17:19:21 +00:00
|
|
|
timespec \
|
|
|
|
timespec-add \
|
2021-02-25 19:57:25 +00:00
|
|
|
timespec-add-time64 \
|
2019-05-09 17:19:21 +00:00
|
|
|
timespec-sub \
|
2021-02-25 19:57:25 +00:00
|
|
|
timespec-sub-time64 \
|
2023-05-23 12:34:56 +00:00
|
|
|
timespec-time64 \
|
2016-12-09 07:18:27 +00:00
|
|
|
write_message \
|
2016-12-31 13:06:16 +00:00
|
|
|
xaccept \
|
2017-04-19 05:44:48 +00:00
|
|
|
xaccept4 \
|
2016-12-09 07:18:27 +00:00
|
|
|
xasprintf \
|
2016-12-31 13:06:16 +00:00
|
|
|
xbind \
|
2016-12-09 07:18:27 +00:00
|
|
|
xcalloc \
|
2020-12-26 17:45:13 +00:00
|
|
|
xchdir \
|
2023-05-23 12:34:56 +00:00
|
|
|
xchmod \
|
2017-06-02 13:50:36 +00:00
|
|
|
xchroot \
|
2019-05-08 14:58:17 +00:00
|
|
|
xclock_gettime \
|
2021-02-25 19:57:25 +00:00
|
|
|
xclock_gettime_time64 \
|
2021-01-18 15:53:26 +00:00
|
|
|
xclock_settime \
|
2021-02-25 19:57:25 +00:00
|
|
|
xclock_settime_time64 \
|
2021-03-10 15:26:30 +00:00
|
|
|
xclone \
|
2017-03-15 12:13:58 +00:00
|
|
|
xclose \
|
2016-12-31 13:06:16 +00:00
|
|
|
xconnect \
|
2018-08-31 20:07:47 +00:00
|
|
|
xcopy_file_range \
|
2017-09-21 02:37:45 +00:00
|
|
|
xdlfcn \
|
2019-02-07 08:02:00 +00:00
|
|
|
xdlmopen \
|
2017-06-02 09:59:28 +00:00
|
|
|
xdup2 \
|
2020-12-26 19:44:34 +00:00
|
|
|
xfchmod \
|
2016-12-31 13:06:16 +00:00
|
|
|
xfclose \
|
|
|
|
xfopen \
|
2016-12-28 12:37:18 +00:00
|
|
|
xfork \
|
2023-03-02 19:10:37 +00:00
|
|
|
xfreopen \
|
2017-12-22 09:55:40 +00:00
|
|
|
xftruncate \
|
2019-11-19 20:17:05 +00:00
|
|
|
xgetline \
|
2016-12-31 13:06:16 +00:00
|
|
|
xgetsockname \
|
|
|
|
xlisten \
|
2017-12-22 09:55:40 +00:00
|
|
|
xlseek \
|
2020-02-09 10:50:44 +00:00
|
|
|
xlstat \
|
2021-02-26 12:59:27 +00:00
|
|
|
xlstat-time64 \
|
2016-12-09 07:18:27 +00:00
|
|
|
xmalloc \
|
2016-12-31 13:06:16 +00:00
|
|
|
xmemstream \
|
2017-06-02 13:50:36 +00:00
|
|
|
xmkdir \
|
2018-07-06 05:10:41 +00:00
|
|
|
xmkdirp \
|
2021-04-08 20:36:07 +00:00
|
|
|
xmkfifo \
|
2017-01-27 05:53:19 +00:00
|
|
|
xmmap \
|
2017-06-21 11:09:08 +00:00
|
|
|
xmprotect \
|
2017-01-27 05:53:19 +00:00
|
|
|
xmunmap \
|
2020-05-18 17:36:19 +00:00
|
|
|
xnewlocale \
|
2017-06-02 13:50:36 +00:00
|
|
|
xopen \
|
2017-06-02 09:59:28 +00:00
|
|
|
xpipe \
|
2016-12-31 13:06:16 +00:00
|
|
|
xpoll \
|
2019-02-06 08:06:34 +00:00
|
|
|
xposix_memalign \
|
2023-05-23 12:34:56 +00:00
|
|
|
xposix_spawn \
|
|
|
|
xposix_spawn_file_actions_addclose \
|
|
|
|
xposix_spawn_file_actions_adddup2 \
|
2017-01-29 00:13:34 +00:00
|
|
|
xpthread_attr_destroy \
|
|
|
|
xpthread_attr_init \
|
2023-05-23 12:34:56 +00:00
|
|
|
xpthread_attr_setaffinity_np \
|
2017-01-29 00:13:34 +00:00
|
|
|
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-01-31 20:01:59 +00:00
|
|
|
xpthread_attr_setguardsize \
|
2019-02-06 08:06:34 +00:00
|
|
|
xpthread_attr_setstack \
|
2017-12-05 14:20:30 +00:00
|
|
|
xpthread_attr_setstacksize \
|
2016-12-09 07:18:27 +00:00
|
|
|
xpthread_barrier_destroy \
|
|
|
|
xpthread_barrier_init \
|
|
|
|
xpthread_barrier_wait \
|
2018-05-29 08:48:46 +00:00
|
|
|
xpthread_barrierattr_destroy \
|
|
|
|
xpthread_barrierattr_init \
|
|
|
|
xpthread_barrierattr_setpshared \
|
2016-12-09 07:18:27 +00:00
|
|
|
xpthread_cancel \
|
|
|
|
xpthread_check_return \
|
2022-09-30 12:19:50 +00:00
|
|
|
xpthread_cond_signal \
|
2023-05-23 12:34:56 +00:00
|
|
|
xpthread_cond_wait \
|
2016-12-09 07:18:27 +00:00
|
|
|
xpthread_create \
|
|
|
|
xpthread_detach \
|
|
|
|
xpthread_join \
|
2020-04-27 19:40:24 +00:00
|
|
|
xpthread_key_create \
|
|
|
|
xpthread_key_delete \
|
2021-01-20 17:32:23 +00:00
|
|
|
xpthread_kill \
|
2017-01-27 05:53:19 +00:00
|
|
|
xpthread_mutex_consistent \
|
|
|
|
xpthread_mutex_destroy \
|
|
|
|
xpthread_mutex_init \
|
2016-12-09 07:18:27 +00:00
|
|
|
xpthread_mutex_lock \
|
|
|
|
xpthread_mutex_unlock \
|
2017-01-27 05:53:19 +00:00
|
|
|
xpthread_mutexattr_destroy \
|
|
|
|
xpthread_mutexattr_init \
|
|
|
|
xpthread_mutexattr_setprotocol \
|
|
|
|
xpthread_mutexattr_setpshared \
|
|
|
|
xpthread_mutexattr_setrobust \
|
|
|
|
xpthread_mutexattr_settype \
|
2016-12-31 13:06:16 +00:00
|
|
|
xpthread_once \
|
2019-01-22 03:50:12 +00:00
|
|
|
xpthread_rwlock_destroy \
|
2023-05-23 12:34:56 +00:00
|
|
|
xpthread_rwlock_init \
|
2017-07-28 04:22:44 +00:00
|
|
|
xpthread_rwlock_rdlock \
|
|
|
|
xpthread_rwlock_unlock \
|
2017-11-12 08:53:06 +00:00
|
|
|
xpthread_rwlock_wrlock \
|
2017-07-28 04:22:44 +00:00
|
|
|
xpthread_rwlockattr_init \
|
|
|
|
xpthread_rwlockattr_setkind_np \
|
2016-12-09 07:18:27 +00:00
|
|
|
xpthread_sigmask \
|
|
|
|
xpthread_spin_lock \
|
|
|
|
xpthread_spin_unlock \
|
2017-12-05 14:20:30 +00:00
|
|
|
xraise \
|
2017-11-12 08:53:06 +00:00
|
|
|
xreadlink \
|
2016-12-09 07:18:27 +00:00
|
|
|
xrealloc \
|
2016-12-31 13:06:16 +00:00
|
|
|
xrecvfrom \
|
|
|
|
xsendto \
|
2019-11-11 13:57:23 +00:00
|
|
|
xsetlocale \
|
2016-12-31 13:06:16 +00:00
|
|
|
xsetsockopt \
|
2017-12-05 14:20:30 +00:00
|
|
|
xsigaction \
|
|
|
|
xsignal \
|
2019-01-15 19:58:15 +00:00
|
|
|
xsigstack \
|
2016-12-31 17:51:07 +00:00
|
|
|
xsocket \
|
2016-12-31 13:06:16 +00:00
|
|
|
xstrdup \
|
2017-11-12 08:53:06 +00:00
|
|
|
xstrndup \
|
2018-07-06 05:10:41 +00:00
|
|
|
xsymlink \
|
2017-12-05 14:20:30 +00:00
|
|
|
xsysconf \
|
2017-11-12 08:53:06 +00:00
|
|
|
xunlink \
|
2020-05-18 17:36:19 +00:00
|
|
|
xuselocale \
|
2016-12-28 12:37:18 +00:00
|
|
|
xwaitpid \
|
2016-12-31 13:06:16 +00:00
|
|
|
xwrite \
|
2023-05-23 12:34:56 +00:00
|
|
|
# libsupport-routines
|
2016-12-09 07:18:27 +00: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 05:10:41 +00:00
|
|
|
CFLAGS-support_paths.c = \
|
|
|
|
-DSRCDIR_PATH=\"`cd .. ; pwd`\" \
|
|
|
|
-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
|
2018-10-04 11:07:29 +00:00
|
|
|
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
|
2018-07-06 05:10:41 +00:00
|
|
|
-DINSTDIR_PATH=\"$(prefix)\" \
|
2019-05-13 16:57:37 +00:00
|
|
|
-DLIBDIR_PATH=\"$(libdir)\" \
|
2019-05-13 17:31:53 +00:00
|
|
|
-DBINDIR_PATH=\"$(bindir)\" \
|
2019-05-20 19:08:40 +00:00
|
|
|
-DSBINDIR_PATH=\"$(sbindir)\" \
|
2020-12-11 16:24:08 +00:00
|
|
|
-DSLIBDIR_PATH=\"$(slibdir)\" \
|
2020-01-08 18:24:42 +00:00
|
|
|
-DROOTSBINDIR_PATH=\"$(rootsbindir)\" \
|
2023-03-26 20:00:14 +00:00
|
|
|
-DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" \
|
|
|
|
-DSYSCONFDIR_PATH=\"$(sysconfdir)\"
|
2018-07-06 05:10:41 +00:00
|
|
|
|
2020-07-13 23:15:56 +00:00
|
|
|
# In support_timespec_check_in_range we may be passed a very tight
|
|
|
|
# range for which we should produce a correct result for expected
|
2023-05-20 13:37:47 +00:00
|
|
|
# being within the observed range. The code uses double internally
|
2020-07-13 23:15:56 +00:00
|
|
|
# in support_timespec_check_in_range and for that computation we use
|
|
|
|
# -fexcess-precision=standard.
|
|
|
|
CFLAGS-timespec.c += -fexcess-precision=standard
|
2021-02-25 19:57:25 +00:00
|
|
|
CFLAGS-timespec-time64.c += -fexcess-precision=standard
|
2020-07-13 23:15:56 +00:00
|
|
|
|
2023-02-28 13:37:18 +00:00
|
|
|
# Ensure that general support files use 64-bit time_t
|
|
|
|
CFLAGS-delayed_exit.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-shell-container.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_can_chroot.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_copy_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_copy_file_range.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_descriptor_supports_holes.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_descriptors.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_process_state.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_stat_nanoseconds.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_subprocess.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-support_test_main.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-test-container.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
CFLAGS-xmkdirp.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
# This is required to get an mkstemp which can create large files on some
|
|
|
|
# 32-bit platforms.
|
|
|
|
CFLAGS-temp_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
|
|
|
|
|
2018-07-06 05:10:41 +00:00
|
|
|
ifeq (,$(CXX))
|
|
|
|
LINKS_DSO_PROGRAM = links-dso-program-c
|
|
|
|
else
|
|
|
|
LINKS_DSO_PROGRAM = links-dso-program
|
2018-08-25 02:07:23 +00:00
|
|
|
LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)
|
2018-07-06 05:10:41 +00:00
|
|
|
endif
|
|
|
|
|
2019-06-28 23:30:00 +00:00
|
|
|
ifeq (yes,$(have-selinux))
|
|
|
|
LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
2018-07-06 05:10:41 +00:00
|
|
|
LDLIBS-test-container = $(libsupport)
|
|
|
|
|
|
|
|
others += test-container
|
|
|
|
others-noinstall += test-container
|
|
|
|
|
2023-05-23 12:34:56 +00:00
|
|
|
others += \
|
|
|
|
echo-container \
|
|
|
|
shell-container \
|
|
|
|
true-container \
|
|
|
|
# others
|
|
|
|
others-noinstall += \
|
|
|
|
echo-container \
|
|
|
|
shell-container \
|
|
|
|
true-container \
|
|
|
|
# others-noinstall
|
2018-07-06 05:10:41 +00:00
|
|
|
|
|
|
|
others += $(LINKS_DSO_PROGRAM)
|
|
|
|
others-noinstall += $(LINKS_DSO_PROGRAM)
|
|
|
|
|
elf: Testing infrastructure for ld.so DSO sorting (BZ #17645)
This is the first of a 2-part patch set that fixes slow DSO sorting behavior in
the dynamic loader, as reported in BZ #17645. In order to facilitate such a
large modification to the dynamic loader, this first patch implements a testing
framework for validating shared object sorting behavior, to enable comparison
between old/new sorting algorithms, and any later enhancements.
This testing infrastructure consists of a Python script
scripts/dso-ordering-test.py' which takes in a description language, consisting
of strings that describe a set of link dependency relations between DSOs, and
generates testcase programs and Makefile fragments to automatically test the
described situation, for example:
a->b->c->d # four objects linked one after another
a->[bc]->d;b->c # a depends on b and c, which both depend on d,
# b depends on c (b,c linked to object a in fixed order)
a->b->c;{+a;%a;-a} # a, b, c serially dependent, main program uses
# dlopen/dlsym/dlclose on object a
a->b->c;{}!->[abc] # a, b, c serially dependent; multiple tests generated
# to test all permutations of a, b, c ordering linked
# to main program
(Above is just a short description of what the script can do, more
documentation is in the script comments.)
Two files containing several new tests, elf/dso-sort-tests-[12].def are added,
including test scenarios for BZ #15311 and Redhat issue #1162810 [1].
Due to the nature of dynamic loader tests, where the sorting behavior and test
output occurs before/after main(), generating testcases to use
support/test-driver.c does not suffice to control meaningful timeout for ld.so.
Therefore a new utility program 'support/test-run-command', based on
test-driver.c/support_test_main.c has been added. This does the same testcase
control, but for a program specified through a command-line rather than at the
source code level. This utility is used to run the dynamic loader testcases
generated by dso-ordering-test.py.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1162810
Signed-off-by: Chung-Lin Tang <cltang@codesourcery.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
2021-10-21 13:41:21 +00:00
|
|
|
others += test-run-command
|
|
|
|
others-static += test-run-command
|
|
|
|
others-noinstall += test-run-command
|
|
|
|
LDLIBS-test-run-command = $(libsupport)
|
|
|
|
|
2018-07-06 05:10:41 +00:00
|
|
|
$(objpfx)test-container : $(libsupport)
|
|
|
|
$(objpfx)shell-container : $(libsupport)
|
|
|
|
$(objpfx)echo-container : $(libsupport)
|
|
|
|
$(objpfx)true-container : $(libsupport)
|
elf: Testing infrastructure for ld.so DSO sorting (BZ #17645)
This is the first of a 2-part patch set that fixes slow DSO sorting behavior in
the dynamic loader, as reported in BZ #17645. In order to facilitate such a
large modification to the dynamic loader, this first patch implements a testing
framework for validating shared object sorting behavior, to enable comparison
between old/new sorting algorithms, and any later enhancements.
This testing infrastructure consists of a Python script
scripts/dso-ordering-test.py' which takes in a description language, consisting
of strings that describe a set of link dependency relations between DSOs, and
generates testcase programs and Makefile fragments to automatically test the
described situation, for example:
a->b->c->d # four objects linked one after another
a->[bc]->d;b->c # a depends on b and c, which both depend on d,
# b depends on c (b,c linked to object a in fixed order)
a->b->c;{+a;%a;-a} # a, b, c serially dependent, main program uses
# dlopen/dlsym/dlclose on object a
a->b->c;{}!->[abc] # a, b, c serially dependent; multiple tests generated
# to test all permutations of a, b, c ordering linked
# to main program
(Above is just a short description of what the script can do, more
documentation is in the script comments.)
Two files containing several new tests, elf/dso-sort-tests-[12].def are added,
including test scenarios for BZ #15311 and Redhat issue #1162810 [1].
Due to the nature of dynamic loader tests, where the sorting behavior and test
output occurs before/after main(), generating testcases to use
support/test-driver.c does not suffice to control meaningful timeout for ld.so.
Therefore a new utility program 'support/test-run-command', based on
test-driver.c/support_test_main.c has been added. This does the same testcase
control, but for a program specified through a command-line rather than at the
source code level. This utility is used to run the dynamic loader testcases
generated by dso-ordering-test.py.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1162810
Signed-off-by: Chung-Lin Tang <cltang@codesourcery.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
2021-10-21 13:41:21 +00:00
|
|
|
$(objpfx)test-run-command : $(libsupport) $(common-objpfx)elf/static-stubs.o
|
2018-07-06 05:10:41 +00:00
|
|
|
|
2016-12-28 12:37:18 +00:00
|
|
|
tests = \
|
|
|
|
README-testing \
|
2016-12-31 17:51:07 +00:00
|
|
|
tst-support-namespace \
|
2022-09-22 10:10:41 +00:00
|
|
|
tst-support-open-dev-null-range \
|
|
|
|
tst-support-process_state \
|
2018-10-30 12:11:47 +00:00
|
|
|
tst-support_blob_repeat \
|
2017-06-02 09:59:28 +00:00
|
|
|
tst-support_capture_subprocess \
|
2018-12-06 14:39:42 +00:00
|
|
|
tst-support_descriptors \
|
2017-03-15 11:57:12 +00:00
|
|
|
tst-support_format_dns_packet \
|
2018-05-16 15:00:35 +00:00
|
|
|
tst-support_quote_blob \
|
2021-10-12 13:48:39 +00:00
|
|
|
tst-support_quote_blob_wide \
|
2018-11-27 20:35:56 +00:00
|
|
|
tst-support_quote_string \
|
2016-12-28 12:37:18 +00:00
|
|
|
tst-support_record_failure \
|
2017-12-04 19:54:24 +00:00
|
|
|
tst-test_compare \
|
2018-05-16 15:00:35 +00:00
|
|
|
tst-test_compare_blob \
|
2018-11-07 11:42:44 +00:00
|
|
|
tst-test_compare_string \
|
2021-10-12 13:48:39 +00:00
|
|
|
tst-test_compare_string_wide \
|
2020-07-10 22:41:06 +00:00
|
|
|
tst-timespec \
|
2017-11-12 08:53:06 +00:00
|
|
|
tst-xreadlink \
|
2019-01-15 19:58:15 +00:00
|
|
|
tst-xsigstack \
|
2023-05-23 12:34:56 +00:00
|
|
|
# tests
|
2016-12-28 12:37:18 +00:00
|
|
|
|
2016-12-30 13:01:44 +00:00
|
|
|
ifeq ($(run-built-tests),yes)
|
2016-12-28 12:37:18 +00: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 13:01:44 +00:00
|
|
|
endif
|
2016-12-09 07:18:27 +00:00
|
|
|
|
2022-09-22 10:10:41 +00:00
|
|
|
tests-special += $(objpfx)tst-glibcpp.out
|
|
|
|
|
|
|
|
$(objpfx)tst-glibcpp.out: tst-glibcpp.py $(..)scripts/glibcpp.py
|
|
|
|
PYTHONPATH=$(..)scripts $(PYTHON) tst-glibcpp.py > $@ 2>&1; \
|
|
|
|
$(evaluate-test)
|
|
|
|
|
2017-03-15 11:57:12 +00:00
|
|
|
$(objpfx)tst-support_format_dns_packet: $(common-objpfx)resolv/libresolv.so
|
|
|
|
|
support: Add support_capture_subprogram
Its API is similar to support_capture_subprocess, but rather creates a
new process based on the input path and arguments. Under the hoods it
uses posix_spawn to create the new process.
It also allows the use of other support_capture_* functions to check
for expected results and free the resources.
Checked on x86_64-linux-gnu.
* support/Makefile (libsupport-routines): Add support_subprocess,
xposix_spawn, xposix_spawn_file_actions_addclose, and
xposix_spawn_file_actions_adddup2.
(tst-support_capture_subprocess-ARGS): New rule.
* support/capture_subprocess.h (support_capture_subprogram): New
prototype.
* support/support_capture_subprocess.c (support_capture_subprocess):
Refactor to use support_subprocess and support_capture_poll.
(support_capture_subprogram): New function.
* support/tst-support_capture_subprocess.c (write_mode_to_str,
str_to_write_mode, test_common, parse_int, handle_restart,
do_subprocess, do_subprogram, do_multiple_tests): New functions.
(do_test): Add support_capture_subprogram tests.
* support/subprocess.h: New file.
* support/support_subprocess.c: Likewise.
* support/xposix_spawn.c: Likewise.
* support/xposix_spawn_file_actions_addclose.c: Likewise.
* support/xposix_spawn_file_actions_adddup2.c: Likewise.
* support/xspawn.h: Likewise.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
2019-04-12 20:39:53 +00:00
|
|
|
tst-support_capture_subprocess-ARGS = -- $(host-test-program-cmd)
|
|
|
|
|
2016-12-09 07:18:27 +00:00
|
|
|
include ../Rules
|