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.
		
	
		
			
				
	
	
		
			149 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			149 lines
		
	
	
		
			4.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 <assert.h>
 | |
| #include <errno.h>
 | |
| #include <stdbool.h>
 | |
| #include <string.h>
 | |
| #include <kernel-features.h>
 | |
| #include "pthreadP.h"
 | |
| #include <atomic.h>
 | |
| 
 | |
| #include <stap-probe.h>
 | |
| 
 | |
| static const struct pthread_mutexattr default_mutexattr =
 | |
|   {
 | |
|     /* Default is a normal mutex, not shared between processes.  */
 | |
|     .mutexkind = PTHREAD_MUTEX_NORMAL
 | |
|   };
 | |
| 
 | |
| 
 | |
| static bool
 | |
| prio_inherit_missing (void)
 | |
| {
 | |
| #ifdef __NR_futex
 | |
|   static int tpi_supported;
 | |
|   if (__glibc_unlikely (tpi_supported == 0))
 | |
|     {
 | |
|       int lock = 0;
 | |
|       INTERNAL_SYSCALL_DECL (err);
 | |
|       int ret = INTERNAL_SYSCALL (futex, err, 4, &lock, FUTEX_UNLOCK_PI, 0, 0);
 | |
|       assert (INTERNAL_SYSCALL_ERROR_P (ret, err));
 | |
|       tpi_supported = INTERNAL_SYSCALL_ERRNO (ret, err) == ENOSYS ? -1 : 1;
 | |
|     }
 | |
|   return __glibc_unlikely (tpi_supported < 0);
 | |
| #endif
 | |
|   return true;
 | |
| }
 | |
| 
 | |
| int
 | |
| __pthread_mutex_init (pthread_mutex_t *mutex,
 | |
| 		      const pthread_mutexattr_t *mutexattr)
 | |
| {
 | |
|   const struct pthread_mutexattr *imutexattr;
 | |
| 
 | |
|   assert (sizeof (pthread_mutex_t) <= __SIZEOF_PTHREAD_MUTEX_T);
 | |
| 
 | |
|   imutexattr = ((const struct pthread_mutexattr *) mutexattr
 | |
| 		?: &default_mutexattr);
 | |
| 
 | |
|   /* Sanity checks.  */
 | |
|   switch (__builtin_expect (imutexattr->mutexkind
 | |
| 			    & PTHREAD_MUTEXATTR_PROTOCOL_MASK,
 | |
| 			    PTHREAD_PRIO_NONE
 | |
| 			    << PTHREAD_MUTEXATTR_PROTOCOL_SHIFT))
 | |
|     {
 | |
|     case PTHREAD_PRIO_NONE << PTHREAD_MUTEXATTR_PROTOCOL_SHIFT:
 | |
|       break;
 | |
| 
 | |
|     case PTHREAD_PRIO_INHERIT << PTHREAD_MUTEXATTR_PROTOCOL_SHIFT:
 | |
|       if (__glibc_unlikely (prio_inherit_missing ()))
 | |
| 	return ENOTSUP;
 | |
|       break;
 | |
| 
 | |
|     default:
 | |
|       /* XXX: For now we don't support robust priority protected mutexes.  */
 | |
|       if (imutexattr->mutexkind & PTHREAD_MUTEXATTR_FLAG_ROBUST)
 | |
| 	return ENOTSUP;
 | |
|       break;
 | |
|     }
 | |
| 
 | |
|   /* Clear the whole variable.  */
 | |
|   memset (mutex, '\0', __SIZEOF_PTHREAD_MUTEX_T);
 | |
| 
 | |
|   /* Copy the values from the attribute.  */
 | |
|   mutex->__data.__kind = imutexattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS;
 | |
| 
 | |
|   if ((imutexattr->mutexkind & PTHREAD_MUTEXATTR_FLAG_ROBUST) != 0)
 | |
|     {
 | |
| #ifndef __ASSUME_SET_ROBUST_LIST
 | |
|       if ((imutexattr->mutexkind & PTHREAD_MUTEXATTR_FLAG_PSHARED) != 0
 | |
| 	  && __set_robust_list_avail < 0)
 | |
| 	return ENOTSUP;
 | |
| #endif
 | |
| 
 | |
|       mutex->__data.__kind |= PTHREAD_MUTEX_ROBUST_NORMAL_NP;
 | |
|     }
 | |
| 
 | |
|   switch (imutexattr->mutexkind & PTHREAD_MUTEXATTR_PROTOCOL_MASK)
 | |
|     {
 | |
|     case PTHREAD_PRIO_INHERIT << PTHREAD_MUTEXATTR_PROTOCOL_SHIFT:
 | |
|       mutex->__data.__kind |= PTHREAD_MUTEX_PRIO_INHERIT_NP;
 | |
|       break;
 | |
| 
 | |
|     case PTHREAD_PRIO_PROTECT << PTHREAD_MUTEXATTR_PROTOCOL_SHIFT:
 | |
|       mutex->__data.__kind |= PTHREAD_MUTEX_PRIO_PROTECT_NP;
 | |
| 
 | |
|       int ceiling = (imutexattr->mutexkind
 | |
| 		     & PTHREAD_MUTEXATTR_PRIO_CEILING_MASK)
 | |
| 		    >> PTHREAD_MUTEXATTR_PRIO_CEILING_SHIFT;
 | |
|       if (! ceiling)
 | |
| 	{
 | |
| 	  /* See __init_sched_fifo_prio.  */
 | |
| 	  if (atomic_load_relaxed (&__sched_fifo_min_prio) == -1)
 | |
| 	    __init_sched_fifo_prio ();
 | |
| 	  if (ceiling < atomic_load_relaxed (&__sched_fifo_min_prio))
 | |
| 	    ceiling = atomic_load_relaxed (&__sched_fifo_min_prio);
 | |
| 	}
 | |
|       mutex->__data.__lock = ceiling << PTHREAD_MUTEX_PRIO_CEILING_SHIFT;
 | |
|       break;
 | |
| 
 | |
|     default:
 | |
|       break;
 | |
|     }
 | |
| 
 | |
|   /* The kernel when waking robust mutexes on exit never uses
 | |
|      FUTEX_PRIVATE_FLAG FUTEX_WAKE.  */
 | |
|   if ((imutexattr->mutexkind & (PTHREAD_MUTEXATTR_FLAG_PSHARED
 | |
| 				| PTHREAD_MUTEXATTR_FLAG_ROBUST)) != 0)
 | |
|     mutex->__data.__kind |= PTHREAD_MUTEX_PSHARED_BIT;
 | |
| 
 | |
|   /* Default values: mutex not used yet.  */
 | |
|   // mutex->__count = 0;	already done by memset
 | |
|   // mutex->__owner = 0;	already done by memset
 | |
|   // mutex->__nusers = 0;	already done by memset
 | |
|   // mutex->__spins = 0;	already done by memset
 | |
|   // mutex->__next = NULL;	already done by memset
 | |
| 
 | |
|   LIBC_PROBE (mutex_init, 1, mutex);
 | |
| 
 | |
|   return 0;
 | |
| }
 | |
| weak_alias (__pthread_mutex_init, pthread_mutex_init)
 | |
| hidden_def (__pthread_mutex_init)
 |