From patchwork Fri Dec 15 07:47:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 24959 Received: (qmail 96792 invoked by alias); 15 Dec 2017 07:48:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 96688 invoked by uid 89); 15 Dec 2017 07:48:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=barely X-HELO: mx1.redhat.com Subject: Re: [PATCH] nptl: Add pthread_thread_number_np function To: Carlos O'Donell References: <20171214185611.D08E1439942EA@oldenburg.str.redhat.com> From: Florian Weimer Cc: libc-alpha@sourceware.org Message-ID: <82837141-5baa-bb34-607b-fe8de3199c9c@redhat.com> Date: Fri, 15 Dec 2017 08:47:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: On 12/15/2017 05:08 AM, Carlos O'Donell wrote: > On 12/14/2017 10:56 AM, Florian Weimer wrote: >> The implementation is actually in libc.so. With a full implementation >> of pthread_self in libc.so, pthread_thread_number_np is completely >> usable without libpthread. > > High level: > > The addition of a new API to libc.so needs a strong justification. > > Do you have a use in mind for this API? > > When would users use this number? > > Why would they use this number? Logging, and discriminating between threads, for example in random bit generators. > Do any of the uses you envision overlap with the longstanding > requests for gettid()? Barely, because gettid does not return a unique number over time, and the number returned from pthread_thread_number_np cannot be used with existing interfaces. > Design level: > > We make claims that the thread number is never reused, but then the > implementation wraps the uint64_t global counter, and reuses the > number. If we really don't allow reuse, then we limit the implementation > to only ever starting 2^64-1 threads, similar to the discussions around > dlopen and void* cookies, I don't know if this kind of limit is a good > idea or not. My instinct tells me we should not limit the implementation > in such ways. The implementation of condition variables uses a 64-bit counter in a similar way. I assumed that we had consensus that we can assume that a simple 64-bit counter would never overflow. > We could allocate the thread numbers lazily, and that would certainly > avoid limiting ourselves to only allocating 2^64-1 threads. On top of > that if the function could return an error then we could return such > an error at overflow: > > int pthread_thread_number_np (uint64_t* thread_number, pthread_t @var{thread}) > > Returns 0 if the thread has a unique number, otherwise -1 if it does not. That's a bad interface. If you are worried about 64-bit overflow, we should use a 128-bit counter instead, but I'm not convinced this is necessary. Lazy allocation would make the function not safe for use in signal handlers. >> +This function returns a number that uniquely identifies @var{thread} >> +among all past, current, and future running threads. This number does >> +not change during the life-time of the thread. Once returned by this >> +function, a number will not be reused after the thread terminates. > > We should be clear here that uint64_t (the return type) only has 64-bits, > and while theoretically difficult to reach, this has a limit. The only way > not to reuse the numbers is to limit the implementation to only allowing > uint64_t worth of threads to ever be started. That's a limit that never > existed before the existence of this API. This restriction already existed: We use two 64b counters: __wseq and __g1_start. They are monotonically increasing and single-writer-multiple-readers counters, so we can implement load, fetch-and-add, and fetch-and-xor operations even when we just have 32b atomics. Values we add or xor are less than or equal to 1<<31 (*), so we only have to make overflow-and-addition atomic wrt. to concurrent load operations and xor operations. To do that, we split each counter into two 32b values of which we reserve the MSB of each to represent an overflow from the lower-order half to the higher-order half. > My worry here is that once you open pandoras box and say that they thread > number *might* be reused after 2^64-1 pthread_create's, then users will > start writing code *not* to treat it as unique. I'm going to put in a __libc_fatal, just to be on the safe side. > Thus, see my notes above about changing the interface slightly. > >> + >> +The returned number is only unique with regards to the current process. >> +It may be shared by subprocesses and other processes in the system. >> + >> +The initial (main) thread has number 1. Thread numbers are not >> +necessarily assigned in a consecutive fashion. They bear no >> +relationship to process IDs or thread IDs assigned by the kernel. > > Suggest: > > They bear no relationship to POSIX thread IDs (pthread_t), process IDs, > or Linux kernel thread IDs. “ They bear no relationship to POSIX thread IDs (@code{pthread_t} values), process IDs or thread IDs assigned by the kernel. ” (This is in the generic part of the manual, so we shouldn't reference Linux unless absolutely necessary.) >> + pthread_thread_number_np; >> + } >> GLIBC_PRIVATE { >> __libc_alloca_cutoff; >> # Internal libc interface to libpthread >> diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c >> index 1cc7893195..0e1cf3939e 100644 >> --- a/nptl/allocatestack.c >> +++ b/nptl/allocatestack.c >> @@ -413,16 +413,21 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, >> assert (powerof2 (pagesize_m1 + 1)); >> assert (TCB_ALIGNMENT >= STACK_ALIGN); >> >> - /* Get the stack size from the attribute if it is set. Otherwise we >> - use the default we determined at start time. */ >> - if (attr->stacksize != 0) >> - size = attr->stacksize; >> - else >> - { >> - lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); >> + uint64_t thread_number; >> + lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); > > You need to add some P&C comments explaining that __default_pthread_attr_lock > is now *also* protecting the global_thread_number global and why. I now have: uint64_t thread_number; lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); { /* Number 1 is reserved for the initial thread. Reuse __default_pthread_attr_lock to avoid concurrent updates of this counter. */ static uint64_t global_thread_number = 1; thread_number = ++global_thread_number; /* Check for counter wrap-around. This should never happen because 2**64 is such a large value. */ if (thread_number == 0) __libc_fatal ("Fatal glibc error: maximum number of threads exceeded\n"); >> +static int >> +do_test (void) >> +{ >> + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); >> + support_isolate_in_subprocess (subprocess, NULL); > > Why do we isolate this in a subprocess? To check that the main thread has thread number 1 in a subprocess. I'll add a comment. New patch attached. Thanks, Florian Subject: [PATCH] nptl: Add pthread_thread_number_np function To: libc-alpha@sourceware.org The implementation is actually in libc.so. With a full implementation of pthread_self in libc.so, pthread_thread_number_np is completely usable without libpthread. 2017-12-14 Florian Weimer nptl: Add pthread_thread_number_np function. * csu/libc-tls.c (__libc_setup_tls): Call __dl_inittcb. * elf/Makefile (dl-routines): Add dl-inittcb. * elf/dl-inittcb.c: New file. * elf/rtld.c (init_tls): Call __dl_inittcb. * manual/threads.texi (Non-POSIX Extensions): Reference Non-POSIX Extensions. (Non-POSIX Extensions): New node. * nptl/Makefile (routines): Add thread_number. (tests): Add tst-thread_number-single, tst-thread_number-multi, tst-thread_number-single-static, tst-thread_number-multi-static. (tests-nolibpthread): Add tst-thread_number-single, tst-thread_number-single-static. (tests-static): Add tst-thread_number-single-static, tst-thread_number-multi-static. * nptl/Versions (GLIBC_2.27): Export pthread_thread_number_np. * nptl/allocatestack.c (allocate_stack): Increment global_thread_number under__default_pthread_attr_lock and use its value to set the new thread number. * nptl/descr.h (struct pthread): Add number member. * nptl/thread_number.c: New file. * nptl/tst-thread_number-multi.c: Likewise. * nptl/tst-thread_number-single.c: Likewise. * nptl/tst-thread_number-multi-static.c: Likewise. * nptl/tst-thread_number-single-static.c: Likewise. * sysdeps/nptl/pthread.h (pthread_thread_number_np): Declare. * sysdeps/unix/sysv/linux/libc**.abilist: Update. diff --git a/NEWS b/NEWS index c5607c855f..257b252a63 100644 --- a/NEWS +++ b/NEWS @@ -46,7 +46,8 @@ Major new features: _Float32x types, as defined by ISO/IEC TS 18661-3:2015. These are corresponding interfaces to those supported for _Float128. -* glibc now implements the memfd_create and mlock2 functions on Linux. +* glibc now implements the memfd_create, mlock2, and + pthread_thread_number_np functions on Linux. * Support for memory protection keys was added. The header now declares the functions pkey_alloc, pkey_free, pkey_mprotect, pkey_set, diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 00138eb43a..af81cba12c 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -195,6 +195,7 @@ __libc_setup_tls (void) #endif if (__builtin_expect (lossage != NULL, 0)) _startup_fatal (lossage); + __dl_inittcb (); /* Update the executable's link map with enough information to make the TLS routines happy. */ diff --git a/elf/Makefile b/elf/Makefile index 8563555079..66ce2953a4 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -30,7 +30,7 @@ routines = $(all-dl-routines) dl-support dl-iteratephdr \ # profiled libraries. dl-routines = $(addprefix dl-,load lookup object reloc deps hwcaps \ runtime init fini debug misc \ - version profile tls origin scope \ + version profile tls inittcb origin scope \ execstack caller open close trampoline \ exception sort-maps) ifeq (yes,$(use-ldconfig)) diff --git a/elf/dl-inittcb.c b/elf/dl-inittcb.c new file mode 100644 index 0000000000..5a70e9775d --- /dev/null +++ b/elf/dl-inittcb.c @@ -0,0 +1,22 @@ +/* Initialize TCB contents. Generic version. + Copyright (C) 2017 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 + . */ + +void +__dl_inittcb (void) +{ +} diff --git a/elf/rtld.c b/elf/rtld.c index cfd3729b8e..214e2312fa 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -740,6 +740,7 @@ cannot allocate TLS data structures for initial thread\n"); const char *lossage = TLS_INIT_TP (tcbp); if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); + __dl_inittcb (); tls_init_tp_called = true; return tcbp; diff --git a/manual/threads.texi b/manual/threads.texi index 769d974d50..6aa08f398a 100644 --- a/manual/threads.texi +++ b/manual/threads.texi @@ -80,6 +80,7 @@ the standard. @menu * Default Thread Attributes:: Setting default attributes for threads in a process. +* Identifying Threads:: Unique identifiers for threads. @end menu @node Default Thread Attributes @@ -124,6 +125,30 @@ The system does not have sufficient memory. @end table @end deftypefun +@node Identifying Threads +@subsection Unique identifiers for threads + +@Theglibc{} provides a non-standard function to obtain a unique thread +identifier. + +@deftypefun uint64_t pthread_thread_number_np (pthread_t @var{thread}) +@standards{GNU, pthread.h} +@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}} + +This function returns a number that uniquely identifies @var{thread} +among all past, current, and future running threads. This number does +not change during the life-time of the thread. Once returned by this +function, a number will not be reused after the thread terminates. + +The returned number is only unique with regards to the current process. +It may be shared by subprocesses and other processes in the system. + +The initial (main) thread has number 1. Thread numbers are not +necessarily assigned in a consecutive fashion. They bear no +relationship to POSIX thread IDs (@code{pthread_t} values), process IDs +or thread IDs assigned by the kernel. +@end deftypefun + @c FIXME these are undocumented: @c pthread_atfork @c pthread_attr_destroy diff --git a/nptl/Makefile b/nptl/Makefile index ae388d1112..087fb6a8b5 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -30,7 +30,7 @@ install-lib-ldscripts := libpthread.so routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \ libc-cleanup libc_pthread_init libc_multiple_threads \ - register-atfork unregister-atfork pthread_self + register-atfork unregister-atfork pthread_self thread_number shared-only-routines = forward # We need to provide certain routines for compatibility with existing @@ -302,7 +302,8 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \ c89 gnu89 c99 gnu99 c11 gnu11) \ tst-bad-schedattr \ tst-thread_local1 tst-mutex-errorcheck tst-robust10 \ - tst-robust-fork tst-create-detached tst-memstream + tst-robust-fork tst-create-detached tst-memstream \ + tst-thread_number-single tst-thread_number-multi \ tests-internal := tst-rwlock19 tst-rwlock20 \ tst-sem11 tst-sem12 tst-sem13 \ @@ -318,7 +319,9 @@ test-srcs = tst-oddstacklimit test-xfail-tst-once5 = yes # Files which must not be linked with libpthread. -tests-nolibpthread = tst-unload +tests-nolibpthread = tst-unload \ + tst-thread_number-single \ + tst-thread_number-single-static \ gen-as-const-headers = pthread-errnos.sym \ unwindbuf.sym \ @@ -433,9 +436,13 @@ link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \ tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \ tst-cancel21-static tst-cancel24-static tst-cond8-static \ tst-mutex8-static tst-mutexpi8-static tst-sem11-static \ - tst-sem12-static + tst-sem12-static tst-thread_number-single-static \ + tst-thread_number-multi-static \ + tests += tst-cancel21-static tst-cancel24-static \ - tst-cond8-static + tst-cond8-static tst-thread_number-single-static \ + tst-thread_number-multi-static \ + tests-internal += tst-sem11-static tst-sem12-static tst-stackguard1-static xtests-static += tst-setuid1-static diff --git a/nptl/Versions b/nptl/Versions index 0ae5def464..a7204912a8 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -28,6 +28,9 @@ libc { pthread_cond_wait; pthread_cond_signal; pthread_cond_broadcast; pthread_cond_timedwait; } + GLIBC_2.27 { + pthread_thread_number_np; + } GLIBC_PRIVATE { __libc_alloca_cutoff; # Internal libc interface to libpthread diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 1cc7893195..454df7740b 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -413,16 +413,28 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, assert (powerof2 (pagesize_m1 + 1)); assert (TCB_ALIGNMENT >= STACK_ALIGN); - /* Get the stack size from the attribute if it is set. Otherwise we - use the default we determined at start time. */ - if (attr->stacksize != 0) - size = attr->stacksize; - else - { - lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); + uint64_t thread_number; + lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); + { + /* Number 1 is reserved for the initial thread. Reuse + __default_pthread_attr_lock to avoid concurrent updates of this + counter. */ + static uint64_t global_thread_number = 1; + thread_number = ++global_thread_number; + + /* Check for counter wrap-around. This should never happen + because 2**64 is such a large value. */ + if (thread_number == 0) + __libc_fatal ("Fatal glibc error: maximum number of threads exceeded\n"); + + /* Get the stack size from the attribute if it is set. Otherwise + we use the default we determined at start time. */ + if (attr->stacksize != 0) + size = attr->stacksize; + else size = __default_pthread_attr.stacksize; - lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE); - } + } + lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE); /* Get memory for the stack. */ if (__glibc_unlikely (attr->flags & ATTR_FLAG_STACKADDR)) @@ -758,6 +770,8 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, #endif pd->robust_head.list = &pd->robust_head; + pd->number = thread_number; + /* We place the thread descriptor at the end of the stack. */ *pdp = pd; diff --git a/nptl/descr.h b/nptl/descr.h index c83b17b674..49e266139e 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -395,6 +395,9 @@ struct pthread /* Resolver state. */ struct __res_state res; + /* Unique number assigned to this thread. */ + uint64_t number; + /* This member must be last. */ char end_padding[]; diff --git a/nptl/thread_number.c b/nptl/thread_number.c new file mode 100644 index 0000000000..a9fdaa508b --- /dev/null +++ b/nptl/thread_number.c @@ -0,0 +1,26 @@ +/* Unique numbers for threads. + Copyright (C) 2017 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 + . */ + +#include "pthreadP.h" + +__uint64_t +pthread_thread_number_np (pthread_t threadid) +{ + struct pthread *pd = (struct pthread *) threadid; + return pd->number; +} diff --git a/nptl/tst-thread_number-multi-static.c b/nptl/tst-thread_number-multi-static.c new file mode 100644 index 0000000000..658928cfd5 --- /dev/null +++ b/nptl/tst-thread_number-multi-static.c @@ -0,0 +1,19 @@ +/* Test unique numbers for threads, static multi-threaded version. + Copyright (C) 2017 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 + . */ + +#include "tst-thread_number-multi.c" diff --git a/nptl/tst-thread_number-multi.c b/nptl/tst-thread_number-multi.c new file mode 100644 index 0000000000..881fe6b097 --- /dev/null +++ b/nptl/tst-thread_number-multi.c @@ -0,0 +1,101 @@ +/* Test unique numbers for threads, non-static multi-threaded version. + Copyright (C) 2017 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 + . */ + +#include +#include +#include +#include +#include +#include +#include + +/* Used to check that the main thread still has thread number 1 in a + subprocess. */ +static void +subprocess (void *closure) +{ + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); +} + +static void * +subthread (void *closure) +{ + if (closure != NULL) + xpthread_barrier_wait (closure); + return NULL; +} + +static int +compare (const void *pleft, const void *pright) +{ + uint64_t left = *(const uint64_t *)pleft; + uint64_t right = *(const uint64_t *)pright; + if (left < right) + return -1; + if (left > right) + return 1; + return 0; +} + +static int +do_test (void) +{ + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); + support_isolate_in_subprocess (subprocess, NULL); + + /* Create thread_count threads, half of which are joined + immediately, have of which stay around. */ + enum { thread_count = 10 }; + pthread_barrier_t barrier; + xpthread_barrier_init (&barrier, NULL, thread_count / 2 + 1); + uint64_t ids[thread_count]; + pthread_t threads[thread_count]; /* Only even-numbered entries are valid. */ + for (int i = 0; i < thread_count; ++i) + { + bool stay_around = (i % 2) == 0; + threads[i] = xpthread_create (NULL, subthread, + stay_around ? &barrier : NULL); + ids[i] = pthread_thread_number_np (threads[i]); + TEST_VERIFY (ids[i] != 1); + if (!stay_around) + xpthread_join (threads[i]); + } + + /* Check that the IDs are all distinct. */ + qsort (ids, thread_count, sizeof (ids[0]), compare); + for (int i = 1; i < thread_count; ++i) + TEST_VERIFY (ids[i - 1] < ids[i]); + + /* Main thread ID should remain at 1. */ + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); + support_isolate_in_subprocess (subprocess, NULL); + + /* Clean up. */ + xpthread_barrier_wait (&barrier); + for (int i = 0; i < thread_count; ++i) + if ((i % 2) == 0) + xpthread_join (threads[i]); + + /* Main thread ID should still remain at 1. */ + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); + support_isolate_in_subprocess (subprocess, NULL); + + return 0; +} + +#include diff --git a/nptl/tst-thread_number-single-static.c b/nptl/tst-thread_number-single-static.c new file mode 100644 index 0000000000..5c21063c36 --- /dev/null +++ b/nptl/tst-thread_number-single-static.c @@ -0,0 +1,19 @@ +/* Test unique numbers for threads, static single-threaded version. + Copyright (C) 2017 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 + . */ + +#include "tst-thread_number-single.c" diff --git a/nptl/tst-thread_number-single.c b/nptl/tst-thread_number-single.c new file mode 100644 index 0000000000..7d3e7ee1dd --- /dev/null +++ b/nptl/tst-thread_number-single.c @@ -0,0 +1,40 @@ +/* Test unique numbers for threads, non-static single-threaded version. + Copyright (C) 2017 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 + . */ + +#include +#include +#include + +/* Used to check that the main thread still has thread number 1 in a + subprocess. */ +static void +subprocess (void *closure) +{ + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); +} + +static int +do_test (void) +{ + TEST_COMPARE (pthread_thread_number_np (pthread_self ()), 1U); + support_isolate_in_subprocess (subprocess, NULL); + + return 0; +} + +#include diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 7a65dc641c..99f2e58875 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1056,6 +1056,10 @@ void __libc_setup_tls (void); void __pthread_initialize_minimal (void) weak_function; #endif +/* Initialize the already-existing TCB for the main thread. Called + during dynamic linker startup or from __libc_setup_tls. */ +void __dl_inittcb (void) attribute_hidden; + /* Allocate memory for static TLS block (unless MEM is nonzero) and dtv. */ extern void *_dl_allocate_tls (void *mem); rtld_hidden_proto (_dl_allocate_tls) diff --git a/sysdeps/nptl/dl-inittcb.c b/sysdeps/nptl/dl-inittcb.c new file mode 100644 index 0000000000..c25424dfa6 --- /dev/null +++ b/sysdeps/nptl/dl-inittcb.c @@ -0,0 +1,27 @@ +/* Initialize TCB contents. NPTL version. + Copyright (C) 2017 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 + . */ + +#include +#include + +void +__dl_inittcb (void) +{ + /* The main thread has number 1. */ + THREAD_SELF->number = 1; +} diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index 2b2b386ab3..e0714ed951 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -1148,6 +1148,10 @@ extern int pthread_atfork (void (*__prepare) (void), void (*__child) (void)) __THROW; +/* Return a number uniquely identifying THREAD, even after its + termination. */ +__uint64_t pthread_thread_number_np (pthread_t __thread_id) __THROW; + #ifdef __USE_EXTERN_INLINES /* Optimizations. */ __extern_inline int diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index ec0ead15dd..e9ba69cd43 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2113,6 +2113,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 5355769974..71258b014b 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2024,6 +2024,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/arm/libc.abilist b/sysdeps/unix/sysv/linux/arm/libc.abilist index 9bafe71b51..df5eb357f8 100644 --- a/sysdeps/unix/sysv/linux/arm/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/libc.abilist @@ -114,6 +114,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist index 90aa8d034f..3c37cf48ec 100644 --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist @@ -1878,6 +1878,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index 4d44c30c64..aba40e2119 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -2043,6 +2043,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index 112fc57634..6ef38f5150 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -1907,6 +1907,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 2e8b6a4586..63cda3a92e 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -115,6 +115,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index 3c33400f67..4b0d923e1c 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -1992,6 +1992,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/microblaze/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/libc.abilist index e1b1a579d2..68c927f54e 100644 --- a/sysdeps/unix/sysv/linux/microblaze/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/libc.abilist @@ -2113,6 +2113,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index c1550323f3..71f3785cdd 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -1967,6 +1967,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 3b3a172e4f..09d7344ce9 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -1965,6 +1965,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index 101ca7a241..fea609bd3a 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -1963,6 +1963,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 2d129f7170..3cd9e072a3 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -1958,6 +1958,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist index 8bc350aff8..b8b2941999 100644 --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist @@ -2154,6 +2154,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist index 127c426e1c..60f5c63cc9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist @@ -1996,6 +1996,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist index a9411318e2..f538a91cb2 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist @@ -2001,6 +2001,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist index d7bf5db601..f83d43c8cb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist @@ -2208,6 +2208,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist index a3415a72ac..e61ce85a68 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist @@ -115,6 +115,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 414338f9a2..ae74cb8184 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -1996,6 +1996,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index f0f7a69b64..fffbcb3d3e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -1897,6 +1897,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/sh/libc.abilist b/sysdeps/unix/sysv/linux/sh/libc.abilist index 9f95aba898..cb8eb05b2e 100644 --- a/sysdeps/unix/sysv/linux/sh/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/libc.abilist @@ -1882,6 +1882,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index 83fbdf2d7e..4184dcff17 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -1989,6 +1989,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index ee84ad10bc..cb9a0ae97f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -1926,6 +1926,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf128 F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist index dcbfbc05ac..c305690b5a 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist +++ b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist @@ -2120,6 +2120,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist index 53dc99c45a..be6507ee22 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist +++ b/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist @@ -2120,6 +2120,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist index dcbfbc05ac..c305690b5a 100644 --- a/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist +++ b/sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist @@ -2120,6 +2120,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index ae4dcaa47e..f418549369 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -1884,6 +1884,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 0dbda14796..6bc513a7ed 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -2127,6 +2127,7 @@ GLIBC_2.27 pkey_free F GLIBC_2.27 pkey_get F GLIBC_2.27 pkey_mprotect F GLIBC_2.27 pkey_set F +GLIBC_2.27 pthread_thread_number_np F GLIBC_2.27 strfromf32 F GLIBC_2.27 strfromf32x F GLIBC_2.27 strfromf64 F