mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	This patch adds internal definition (through {libc_}hidden_{proto,def}) and
also change some strong to weak alias for symbols that might be used by C11
threads implementations.
The patchset should not change libc/libpthread functional, although object
changes are expected (since now internal symbols are used instead) and final
exported symbols through GLIBC_PRIVATE is also expanded (to cover libpthread
usage of __mmap{64}, __munmap, __mprotect).
Checked with a build for all major ABI (aarch64-linux-gnu, alpha-linux-gnu,
arm-linux-gnueabi, i386-linux-gnu, ia64-linux-gnu, m68k-linux-gnu,
microblaze-linux-gnu [1], mips{64}-linux-gnu, nios2-linux-gnu,
powerpc{64le}-linux-gnu, s390{x}-linux-gnu, sparc{64}-linux-gnu,
tile{pro,gx}-linux-gnu, and x86_64-linux-gnu).
	* include/sched.h (__sched_get_priority_max): Add libc hidden proto.
	(__sched_get_prioriry_min): Likewise.
	* include/sys/mman.h (__mmap): Likewise.
	(__mmap64): Likewise.
	(__munmap): Likewise.
	(__mprotect): Likewise.
	* include/termios.h (__tcsetattr): Likewise.
	* include/time.h (__nanosleep): Use hidden_proto instead of
	libc_hidden_proto.
	* posix/nanosleep.c (__nanosleep): Likewise.
	* misc/Versions (libc): Export __mmap, __munmap, __mprotect,
	__sched_get_priority_min, and __sched_get_priority_max under
	GLIBC_PRIVATE.
	* nptl/allocatestack.c (__free_stacks): Use internal definition for
	libc symbols.
	(change_stack_perm): Likewise.
	(allocate_stack): Likewise.
	* sysdeps/posix/gethostname.c: Likewise.
	* nptl/tpp.c (__init_sched_fifo_prio): Likewise.
	* sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/ioctl.c (__ioctl): Likewise.
	* nptl/pthreadP.h (__pthread_mutex_timedlock): Add definition.
	(__pthread_key_delete): Likewise.
	(__pthread_detach): Likewise.
	(__pthread_cancel): Likewise.
	(__pthread_mutex_trylock): Likewise.
	(__pthread_mutexattr_init): Likewise.
	(__pthread_mutexattr_settype): Likewise.
	* nptl/pthread_cancel.c (pthread_cancel): Change to internal name and
	create alias for exported one.
	* nptl/pthread_join.c (pthread_join): Likewise.
	* nptl/pthread_detach.c (pthread_detach): Likewise.
	* nptl/pthread_key_delete.c (pthread_key_delete): Likewise.
	* nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): Likewise.
	* nptl/pthread_create.c: Change static requirements for pthread
	symbols.
	* nptl/pthread_equal.c (__pthread_equal): Change strong alias to weak
	for internal definition.
	* nptl/pthread_exit.c (__pthread_exit): Likewise.
	* nptl/pthread_getspecific.c (__pthread_getspecific): Likewise.
	* nptl/pthread_key_create.c (__pthread_key_create): Likewise.
	* nptl/pthread_mutex_destroy.c (__pthread_mutex_destroy): Likewise.
	* nptl/pthread_mutex_init.c (__pthread_mutex_init): Likewise.
	* nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
	* nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Likewise.
	* nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock): Likewise.
	* nptl/pthread_mutexattr_init.c (__pthread_mutexattr_init): Likwise.
	* nptl/pthread_mutexattr_settype.c (__pthread_mutexattr_settype):
	Likewise.
	* nptl/pthread_self.c (__pthread_self): Likewise.
	* nptl/pthread_setspecific.c (__pthread_setspecific): Likewise.
	* sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Likewise.
	* misc/mmap.c (__mmap): Add internal symbol definition.
	* misc/mmap.c (__mmap64): Likewise.
	* sysdeps/unix/sysv/linux/mmap.c (__mmap): Likewise.
	* sysdeps/unix/sysv/linux/mmap64.c (__mmap): Likewise.
	(__mmap64): Likewise.
	* sysdeps/unix/sysv/linux/i386/Versions (libc) [GLIBC_PRIVATE):
	Add __uname.
		
	
		
			
				
	
	
		
			119 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			119 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (C) 2002-2017 Free Software Foundation, Inc.
 | |
|    This file is part of the GNU C Library.
 | |
|    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 | |
| 
 | |
|    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/>.  */
 | |
| 
 | |
| #include <errno.h>
 | |
| #include <stdlib.h>
 | |
| 
 | |
| #include <atomic.h>
 | |
| #include "pthreadP.h"
 | |
| 
 | |
| #include <stap-probe.h>
 | |
| 
 | |
| 
 | |
| static void
 | |
| cleanup (void *arg)
 | |
| {
 | |
|   /* If we already changed the waiter ID, reset it.  The call cannot
 | |
|      fail for any reason but the thread not having done that yet so
 | |
|      there is no reason for a loop.  */
 | |
|   (void) atomic_compare_and_exchange_bool_acq ((struct pthread **) arg, NULL,
 | |
| 					       THREAD_SELF);
 | |
| }
 | |
| 
 | |
| 
 | |
| int
 | |
| __pthread_join (pthread_t threadid, void **thread_return)
 | |
| {
 | |
|   struct pthread *pd = (struct pthread *) threadid;
 | |
| 
 | |
|   /* Make sure the descriptor is valid.  */
 | |
|   if (INVALID_NOT_TERMINATED_TD_P (pd))
 | |
|     /* Not a valid thread handle.  */
 | |
|     return ESRCH;
 | |
| 
 | |
|   /* Is the thread joinable?.  */
 | |
|   if (IS_DETACHED (pd))
 | |
|     /* We cannot wait for the thread.  */
 | |
|     return EINVAL;
 | |
| 
 | |
|   struct pthread *self = THREAD_SELF;
 | |
|   int result = 0;
 | |
| 
 | |
|   LIBC_PROBE (pthread_join, 1, threadid);
 | |
| 
 | |
|   /* During the wait we change to asynchronous cancellation.  If we
 | |
|      are canceled the thread we are waiting for must be marked as
 | |
|      un-wait-ed for again.  */
 | |
|   pthread_cleanup_push (cleanup, &pd->joinid);
 | |
| 
 | |
|   /* Switch to asynchronous cancellation.  */
 | |
|   int oldtype = CANCEL_ASYNC ();
 | |
| 
 | |
|   if ((pd == self
 | |
|        || (self->joinid == pd
 | |
| 	   && (pd->cancelhandling
 | |
| 	       & (CANCELING_BITMASK | CANCELED_BITMASK | EXITING_BITMASK
 | |
| 		  | TERMINATED_BITMASK)) == 0))
 | |
|       && !CANCEL_ENABLED_AND_CANCELED (self->cancelhandling))
 | |
|     /* This is a deadlock situation.  The threads are waiting for each
 | |
|        other to finish.  Note that this is a "may" error.  To be 100%
 | |
|        sure we catch this error we would have to lock the data
 | |
|        structures but it is not necessary.  In the unlikely case that
 | |
|        two threads are really caught in this situation they will
 | |
|        deadlock.  It is the programmer's problem to figure this
 | |
|        out.  */
 | |
|     result = EDEADLK;
 | |
|   /* Wait for the thread to finish.  If it is already locked something
 | |
|      is wrong.  There can only be one waiter.  */
 | |
|   else if (__builtin_expect (atomic_compare_and_exchange_bool_acq (&pd->joinid,
 | |
| 								   self,
 | |
| 								   NULL), 0))
 | |
|     /* There is already somebody waiting for the thread.  */
 | |
|     result = EINVAL;
 | |
|   else
 | |
|     /* Wait for the child.  */
 | |
|     lll_wait_tid (pd->tid);
 | |
| 
 | |
| 
 | |
|   /* Restore cancellation mode.  */
 | |
|   CANCEL_RESET (oldtype);
 | |
| 
 | |
|   /* Remove the handler.  */
 | |
|   pthread_cleanup_pop (0);
 | |
| 
 | |
| 
 | |
|   if (__glibc_likely (result == 0))
 | |
|     {
 | |
|       /* We mark the thread as terminated and as joined.  */
 | |
|       pd->tid = -1;
 | |
| 
 | |
|       /* Store the return value if the caller is interested.  */
 | |
|       if (thread_return != NULL)
 | |
| 	*thread_return = pd->result;
 | |
| 
 | |
| 
 | |
|       /* Free the TCB.  */
 | |
|       __free_tcb (pd);
 | |
|     }
 | |
| 
 | |
|   LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd->result);
 | |
| 
 | |
|   return result;
 | |
| }
 | |
| weak_alias (__pthread_join, pthread_join)
 |