mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
9dd346ff43
This mostly automatically-generated patch converts 113 function definitions in glibc from old-style K&R to prototype-style. Following my other recent such patches, this one deals with the case of function definitions in files that either contain assertions or where grep suggested they might contain assertions - and thus where it isn't possible to use a simple object code comparison as a sanity check on the correctness of the patch, because line numbers are changed. A few such automatically-generated changes needed to be supplemented by manual changes for the result to compile. openat64 had a prototype declaration with "..." but an old-style definition in sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the generated prototype in the definition (I've filed <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing such cases in GCC; the old state was undefined behavior not requiring a diagnostic, but one seems a good idea). In addition, as Florian has noted regparm attribute mismatches between declaration and definition are only diagnosed for prototype definitions, and five functions needed internal_function added to their definitions (in the case of __pthread_mutex_cond_lock, via the macro definition of __pthread_mutex_lock) to compile on i386. After this patch is in, remaining old-style definitions are probably most readily fixed manually before we can turn on -Wold-style-definition for all builds. Tested for x86_64 and x86 (testsuite). * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style function definition. * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise. * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise. * debug/backtracesyms.c (__backtrace_symbols): Likewise. * elf/dl-minimal.c (_itoa): Likewise. * hurd/hurdmalloc.c (malloc): Likewise. (free): Likewise. (realloc): Likewise. * inet/inet6_option.c (inet6_option_space): Likewise. (inet6_option_init): Likewise. (inet6_option_append): Likewise. (inet6_option_alloc): Likewise. (inet6_option_next): Likewise. (inet6_option_find): Likewise. * io/ftw.c (FTW_NAME): Likewise. (NFTW_NAME): Likewise. (NFTW_NEW_NAME): Likewise. (NFTW_OLD_NAME): Likewise. * libio/iofwide.c (_IO_fwide): Likewise. * libio/strops.c (_IO_str_init_static_internal): Likewise. (_IO_str_init_static): Likewise. (_IO_str_init_readonly): Likewise. (_IO_str_overflow): Likewise. (_IO_str_underflow): Likewise. (_IO_str_count): Likewise. (_IO_str_seekoff): Likewise. (_IO_str_pbackfail): Likewise. (_IO_str_finish): Likewise. * libio/wstrops.c (_IO_wstr_init_static): Likewise. (_IO_wstr_overflow): Likewise. (_IO_wstr_underflow): Likewise. (_IO_wstr_count): Likewise. (_IO_wstr_seekoff): Likewise. (_IO_wstr_pbackfail): Likewise. (_IO_wstr_finish): Likewise. * locale/programs/localedef.c (normalize_codeset): Likewise. * locale/programs/locarchive.c (add_locale_to_archive): Likewise. (add_locales_to_archive): Likewise. (delete_locales_from_archive): Likewise. * malloc/malloc.c (__libc_mallinfo): Likewise. * math/gen-auto-libm-tests.c (init_fp_formats): Likewise. * misc/tsearch.c (__tfind): Likewise. * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise. * nptl/pthread_attr_getdetachstate.c (__pthread_attr_getdetachstate): Likewise. * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize): Likewise. * nptl/pthread_attr_getinheritsched.c (__pthread_attr_getinheritsched): Likewise. * nptl/pthread_attr_getschedparam.c (__pthread_attr_getschedparam): Likewise. * nptl/pthread_attr_getschedpolicy.c (__pthread_attr_getschedpolicy): Likewise. * nptl/pthread_attr_getscope.c (__pthread_attr_getscope): Likewise. * nptl/pthread_attr_getstack.c (__pthread_attr_getstack): Likewise. * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr): Likewise. * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize): Likewise. * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise. (__pthread_attr_init_2_0): Likewise. * nptl/pthread_attr_setdetachstate.c (__pthread_attr_setdetachstate): Likewise. * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize): Likewise. * nptl/pthread_attr_setinheritsched.c (__pthread_attr_setinheritsched): Likewise. * nptl/pthread_attr_setschedparam.c (__pthread_attr_setschedparam): Likewise. * nptl/pthread_attr_setschedpolicy.c (__pthread_attr_setschedpolicy): Likewise. * nptl/pthread_attr_setscope.c (__pthread_attr_setscope): Likewise. * nptl/pthread_attr_setstack.c (__pthread_attr_setstack): Likewise. * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr): Likewise. * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize): Likewise. * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock): Likewise. * nptl/pthread_create.c (__find_in_stack_list): Likewise. * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise. * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to use internal_function. * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to prototype-style function definition. * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. (__pthread_mutex_cond_lock_adjust): Likewise. Use internal_function. * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): Convert to prototype-style function definition. * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Likewise. (__pthread_mutex_unlock): Likewise. * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise. * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise. * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise. * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise. * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise. * nss/makedb.c (process_input): Likewise. * posix/fnmatch.c (__strchrnul): Likewise. (__wcschrnul): Likewise. (fnmatch): Likewise. * posix/fnmatch_loop.c (FCT): Likewise. * posix/glob.c (globfree): Likewise. (__glob_pattern_type): Likewise. (__glob_pattern_p): Likewise. * posix/regcomp.c (re_compile_pattern): Likewise. (re_set_syntax): Likewise. (re_compile_fastmap): Likewise. (regcomp): Likewise. (regerror): Likewise. (regfree): Likewise. * posix/regexec.c (regexec): Likewise. (re_match): Likewise. (re_search): Likewise. (re_match_2): Likewise. (re_search_2): Likewise. (re_search_stub): Likewise. Use internal_function (re_copy_regs): Likewise. (re_set_registers): Convert to prototype-style function definition. (prune_impossible_nodes): Likewise. Use internal_function. * resolv/inet_net_pton.c (inet_net_pton): Convert to prototype-style function definition. (inet_net_pton_ipv4): Likewise. * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise. * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise. * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise. * sysdeps/pthread/timer_delete.c (timer_delete): Likewise. * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise. Make variadic. * time/strptime_l.c (localtime_r): Convert to prototype-style function definition. * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise. * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise. * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise. * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
316 lines
9.2 KiB
C
316 lines
9.2 KiB
C
/* Copyright (C) 2002-2015 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 <stdlib.h>
|
|
#include "pthreadP.h"
|
|
#include <lowlevellock.h>
|
|
#include <stap-probe.h>
|
|
|
|
#ifndef lll_unlock_elision
|
|
#define lll_unlock_elision(a,b,c) ({ lll_unlock (a,c); 0; })
|
|
#endif
|
|
|
|
static int
|
|
internal_function
|
|
__pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
|
|
__attribute_noinline__;
|
|
|
|
int
|
|
internal_function attribute_hidden
|
|
__pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr)
|
|
{
|
|
int type = PTHREAD_MUTEX_TYPE_ELISION (mutex);
|
|
if (__builtin_expect (type &
|
|
~(PTHREAD_MUTEX_KIND_MASK_NP|PTHREAD_MUTEX_ELISION_FLAGS_NP), 0))
|
|
return __pthread_mutex_unlock_full (mutex, decr);
|
|
|
|
if (__builtin_expect (type, PTHREAD_MUTEX_TIMED_NP)
|
|
== PTHREAD_MUTEX_TIMED_NP)
|
|
{
|
|
/* Always reset the owner field. */
|
|
normal:
|
|
mutex->__data.__owner = 0;
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
lll_unlock (mutex->__data.__lock, PTHREAD_MUTEX_PSHARED (mutex));
|
|
|
|
LIBC_PROBE (mutex_release, 1, mutex);
|
|
|
|
return 0;
|
|
}
|
|
else if (__glibc_likely (type == PTHREAD_MUTEX_TIMED_ELISION_NP))
|
|
{
|
|
/* Don't reset the owner/users fields for elision. */
|
|
return lll_unlock_elision (mutex->__data.__lock, mutex->__data.__elision,
|
|
PTHREAD_MUTEX_PSHARED (mutex));
|
|
}
|
|
else if (__builtin_expect (PTHREAD_MUTEX_TYPE (mutex)
|
|
== PTHREAD_MUTEX_RECURSIVE_NP, 1))
|
|
{
|
|
/* Recursive mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
goto normal;
|
|
}
|
|
else if (__builtin_expect (PTHREAD_MUTEX_TYPE (mutex)
|
|
== PTHREAD_MUTEX_ADAPTIVE_NP, 1))
|
|
goto normal;
|
|
else
|
|
{
|
|
/* Error checking mutex. */
|
|
assert (type == PTHREAD_MUTEX_ERRORCHECK_NP);
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| ! lll_islocked (mutex->__data.__lock))
|
|
return EPERM;
|
|
goto normal;
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
internal_function
|
|
__pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
|
|
{
|
|
int newowner = 0;
|
|
|
|
switch (PTHREAD_MUTEX_TYPE (mutex))
|
|
{
|
|
case PTHREAD_MUTEX_ROBUST_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
== THREAD_GETMEM (THREAD_SELF, tid)
|
|
&& __builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
{
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return ENOTRECOVERABLE;
|
|
|
|
goto notrecoverable;
|
|
}
|
|
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
|
|
goto robust;
|
|
|
|
case PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP:
|
|
case PTHREAD_MUTEX_ROBUST_NORMAL_NP:
|
|
case PTHREAD_MUTEX_ROBUST_ADAPTIVE_NP:
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
!= THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| ! lll_islocked (mutex->__data.__lock))
|
|
return EPERM;
|
|
|
|
/* If the previous owner died and the caller did not succeed in
|
|
making the state consistent, mark the mutex as unrecoverable
|
|
and make all waiters. */
|
|
if (__builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
notrecoverable:
|
|
newowner = PTHREAD_MUTEX_NOTRECOVERABLE;
|
|
|
|
robust:
|
|
/* Remove mutex from the list. */
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending,
|
|
&mutex->__data.__list.__next);
|
|
DEQUEUE_MUTEX (mutex);
|
|
|
|
mutex->__data.__owner = newowner;
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
lll_robust_unlock (mutex->__data.__lock,
|
|
PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
|
|
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
|
|
break;
|
|
|
|
/* The PI support requires the Linux futex system call. If that's not
|
|
available, pthread_mutex_init should never have allowed the type to
|
|
be set. So it will get the default case for an invalid type. */
|
|
#ifdef __NR_futex
|
|
case PTHREAD_MUTEX_PI_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
goto continue_pi_non_robust;
|
|
|
|
case PTHREAD_MUTEX_PI_ROBUST_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
== THREAD_GETMEM (THREAD_SELF, tid)
|
|
&& __builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
{
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return ENOTRECOVERABLE;
|
|
|
|
goto pi_notrecoverable;
|
|
}
|
|
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
|
|
goto continue_pi_robust;
|
|
|
|
case PTHREAD_MUTEX_PI_ERRORCHECK_NP:
|
|
case PTHREAD_MUTEX_PI_NORMAL_NP:
|
|
case PTHREAD_MUTEX_PI_ADAPTIVE_NP:
|
|
case PTHREAD_MUTEX_PI_ROBUST_ERRORCHECK_NP:
|
|
case PTHREAD_MUTEX_PI_ROBUST_NORMAL_NP:
|
|
case PTHREAD_MUTEX_PI_ROBUST_ADAPTIVE_NP:
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
!= THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| ! lll_islocked (mutex->__data.__lock))
|
|
return EPERM;
|
|
|
|
/* If the previous owner died and the caller did not succeed in
|
|
making the state consistent, mark the mutex as unrecoverable
|
|
and make all waiters. */
|
|
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) != 0
|
|
&& __builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
pi_notrecoverable:
|
|
newowner = PTHREAD_MUTEX_NOTRECOVERABLE;
|
|
|
|
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) != 0)
|
|
{
|
|
continue_pi_robust:
|
|
/* Remove mutex from the list.
|
|
Note: robust PI futexes are signaled by setting bit 0. */
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending,
|
|
(void *) (((uintptr_t) &mutex->__data.__list.__next)
|
|
| 1));
|
|
DEQUEUE_MUTEX (mutex);
|
|
}
|
|
|
|
continue_pi_non_robust:
|
|
mutex->__data.__owner = newowner;
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
if ((mutex->__data.__lock & FUTEX_WAITERS) != 0
|
|
|| atomic_compare_and_exchange_bool_rel (&mutex->__data.__lock, 0,
|
|
THREAD_GETMEM (THREAD_SELF,
|
|
tid)))
|
|
{
|
|
int robust = mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP;
|
|
int private = (robust
|
|
? PTHREAD_ROBUST_MUTEX_PSHARED (mutex)
|
|
: PTHREAD_MUTEX_PSHARED (mutex));
|
|
INTERNAL_SYSCALL_DECL (__err);
|
|
INTERNAL_SYSCALL (futex, __err, 2, &mutex->__data.__lock,
|
|
__lll_private_flag (FUTEX_UNLOCK_PI, private));
|
|
}
|
|
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
|
|
break;
|
|
#endif /* __NR_futex. */
|
|
|
|
case PTHREAD_MUTEX_PP_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
goto pp;
|
|
|
|
case PTHREAD_MUTEX_PP_ERRORCHECK_NP:
|
|
/* Error checking mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| (mutex->__data.__lock & ~ PTHREAD_MUTEX_PRIO_CEILING_MASK) == 0)
|
|
return EPERM;
|
|
/* FALLTHROUGH */
|
|
|
|
case PTHREAD_MUTEX_PP_NORMAL_NP:
|
|
case PTHREAD_MUTEX_PP_ADAPTIVE_NP:
|
|
/* Always reset the owner field. */
|
|
pp:
|
|
mutex->__data.__owner = 0;
|
|
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
int newval, oldval;
|
|
do
|
|
{
|
|
oldval = mutex->__data.__lock;
|
|
newval = oldval & PTHREAD_MUTEX_PRIO_CEILING_MASK;
|
|
}
|
|
while (atomic_compare_and_exchange_bool_rel (&mutex->__data.__lock,
|
|
newval, oldval));
|
|
|
|
if ((oldval & ~PTHREAD_MUTEX_PRIO_CEILING_MASK) > 1)
|
|
lll_futex_wake (&mutex->__data.__lock, 1,
|
|
PTHREAD_MUTEX_PSHARED (mutex));
|
|
|
|
int oldprio = newval >> PTHREAD_MUTEX_PRIO_CEILING_SHIFT;
|
|
|
|
LIBC_PROBE (mutex_release, 1, mutex);
|
|
|
|
return __pthread_tpp_change_priority (oldprio, -1);
|
|
|
|
default:
|
|
/* Correct code cannot set any other type. */
|
|
return EINVAL;
|
|
}
|
|
|
|
LIBC_PROBE (mutex_release, 1, mutex);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
__pthread_mutex_unlock (pthread_mutex_t *mutex)
|
|
{
|
|
return __pthread_mutex_unlock_usercnt (mutex, 1);
|
|
}
|
|
strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock)
|
|
hidden_def (__pthread_mutex_unlock)
|