diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-07 02:03:45 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-07 13:35:54 +0200 |
commit | d6d74ec16c77126c59db264ebfa04d08d5b4c5c0 (patch) | |
tree | 95fded09b6a9d8ce35273d43c3f8e3d960bd0554 /nptl/tst-tls1.c | |
parent | be22a151f3e2c2e4b9127d4fa30b269f30a7ea2e (diff) | |
download | glibc-d6d74ec16c77126c59db264ebfa04d08d5b4c5c0.zip glibc-d6d74ec16c77126c59db264ebfa04d08d5b4c5c0.tar.gz glibc-d6d74ec16c77126c59db264ebfa04d08d5b4c5c0.tar.bz2 |
htl: Enable more tests
* htl/Makefile: Remove rules adding libpthread.so and libpthread.a to link
lines.
* nptl/Makefile: Move rules adding libpthread.so and libpthread.a to
link lines to...
* sysdeps/pthread/Makefile: ... here.
* nptl/eintr.c, tst-align.c tst-align3.c tst-atfork1.c tst-backtrace1.c
tst-bad-schedattr.c tst-cancel-self-canceltype.c tst-cancel-self-cleanup.c
tst-cancel-self-testcancel.c tst-cancel1.c tst-cancel10.c tst-cancel12.c
tst-cancel14.c tst-cancel15.c tst-cancel18.c tst-cancel19.c tst-cancel2.c
tst-cancel22.c tst-cancel23.c tst-cancel26.c tst-cancel27.c tst-cancel28.c
tst-cancel3.c tst-cancel8.c tst-cancelx1.c tst-cancelx10.c tst-cancelx12.c
tst-cancelx14.c tst-cancelx15.c tst-cancelx18.c tst-cancelx2.c tst-cancelx3.c
tst-cancelx8.c tst-cleanup0.c tst-cleanup0.expect tst-cleanup1.c tst-cleanup2.c
tst-cleanup3.c tst-cleanupx0.c tst-cleanupx0.expect tst-cleanupx1.c
tst-cleanupx2.c tst-cleanupx3.c tst-clock1.c tst-create-detached.c tst-detach1.c
tst-eintr2.c tst-eintr3.c tst-eintr4.c tst-eintr5.c tst-exec1.c tst-exec2.c
tst-exec3.c tst-exit1.c tst-exit2.c tst-exit3.c tst-flock1.c tst-fork1.c
tst-fork2.c tst-fork3.c tst-fork4.c tst-getpid3.c tst-kill1.c tst-kill2.c
tst-kill3.c tst-kill4.c tst-kill5.c tst-kill6.c tst-locale1.c tst-locale2.c
tst-memstream.c tst-popen1.c tst-raise1.c tst-sem5.c tst-setuid3.c tst-signal4.c
tst-signal5.c tst-signal6.c tst-signal8.c tst-stack1.c tst-stdio1.c tst-stdio2.c
tst-sysconf.c tst-tls1.c tst-tls2.c tst-tsd1.c tst-tsd2.c tst-tsd5.c tst-tsd6.c
tst-umask1.c tst-unload.c tst-unwind-thread.c tst-vfork1.c tst-vfork1x.c
tst-vfork2.c tst-vfork2x.c: Move tests to...
* sysdeps/pthread: ... here.
Rename
tst-popen1.c -> tst-pt-popen1.c
tst-align.c -> tst-pt-align.c
tst-align3.c -> tst-pt-align3.c
tst-sysconf.c -> tst-pt-sysconf.c
tst-tls1.c -> tst-pt-tls1.c
tst-tls2.c -> tst-pt-tls2.c
tst-vfork1.c -> tst-pt-vfork1.c
tst-vfork2.c -> tst-pt-vfork2.c
to avoid conflicting with libio/tst-popen1.c, elf/tst-align.c,
posix/tst-sysconf.c, elf/tst-tls1.c, elf/tst-tls2.c, posix/tst-vfork1.c,
posix/tst-vfork2.c.
* nptl/Makefile: Move corresponding tests references and special rules to...
* sysdeps/pthread/Makefile: ... here.
* sysdeps/pthread/tst-stack1.c (do_test): Do not clamp stack size to
PTHREAD_STACK_MIN if not defined.
Tested on linux-x86_64 and hurd-i386
Diffstat (limited to 'nptl/tst-tls1.c')
-rw-r--r-- | nptl/tst-tls1.c | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/nptl/tst-tls1.c b/nptl/tst-tls1.c deleted file mode 100644 index 727610b..0000000 --- a/nptl/tst-tls1.c +++ /dev/null @@ -1,119 +0,0 @@ -/* Copyright (C) 2003-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. - - 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 - <https://www.gnu.org/licenses/>. */ - -#include <pthread.h> -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <inttypes.h> -#include <support/support.h> -#include <support/check.h> -#include <support/xthread.h> - -struct test_s -{ - __attribute__ ((aligned(0x20))) int a; - __attribute__ ((aligned(0x200))) int b; -}; - -#define INIT_A 1 -#define INIT_B 42 -/* Deliberately not static. */ -__thread struct test_s s __attribute__ ((tls_model ("initial-exec"))) = -{ - .a = INIT_A, - .b = INIT_B -}; - -/* Use noinline in combination with not static to ensure that the - alignment check is really done. Otherwise it was optimized out! */ -__attribute__ ((noinline)) void -check_alignment (const char *thr_name, const char *ptr_name, - int *ptr, int alignment) -{ - uintptr_t offset_aligment = ((uintptr_t) ptr) & (alignment - 1); - if (offset_aligment) - { - FAIL_EXIT1 ("%s (%p) is not 0x%x-byte aligned in %s thread\n", - ptr_name, ptr, alignment, thr_name); - } -} - -static void -check_s (const char *thr_name) -{ - if (s.a != INIT_A || s.b != INIT_B) - FAIL_EXIT1 ("initial value of s in %s thread wrong\n", thr_name); - - check_alignment (thr_name, "s.a", &s.a, 0x20); - check_alignment (thr_name, "s.b", &s.b, 0x200); -} - -static void * -tf (void *arg) -{ - check_s ("child"); - - ++s.a; - - return NULL; -} - - -int -do_test (void) -{ - check_s ("main"); - - pthread_attr_t a; - - xpthread_attr_init (&a); - -#define STACK_SIZE (1 * 1024 * 1024) - xpthread_attr_setstacksize (&a, STACK_SIZE); - -#define N 10 - int i; - for (i = 0; i < N; ++i) - { -#define M 10 - pthread_t th[M]; - int j; - for (j = 0; j < M; ++j, ++s.a) - th[j] = xpthread_create (&a, tf, NULL); - - for (j = 0; j < M; ++j) - xpthread_join (th[j]); - } - - /* Also check the alignment of the tls variables if a misaligned stack is - specified. */ - pthread_t th; - void *thr_stack = NULL; - thr_stack = xposix_memalign (0x200, STACK_SIZE + 1); - xpthread_attr_setstack (&a, thr_stack + 1, STACK_SIZE); - th = xpthread_create (&a, tf, NULL); - xpthread_join (th); - free (thr_stack); - - xpthread_attr_destroy (&a); - - return 0; -} - -#include <support/test-driver.c> |