mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 22:40:05 +00:00
f63f2bfdfa
This automatically-generated patch converts 69 function definitions in glibc from old-style K&R to prototype-style. This patch, covering both sysdeps and non-sysdeps files, deals with cases where the prototype needed to be wrapped over more than one line. Otherwise, exclusions and caveats are as for <https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and <https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style function definition. * crypt/crypt_util.c (__encrypt_r): Likewise. * libio/genops.c (_IO_no_init): Likewise. * libio/iofopncook.c (_IO_fopencookie): Likewise. (_IO_old_fopencookie): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iogetline.c (_IO_getline): Likewise. (_IO_getline_info): Likewise. * libio/iogetwline.c (_IO_getwline): Likewise. (_IO_getwline_info): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * locale/programs/simple-hash.c (insert_entry_2): Likewise. (find_entry): Likewise. (iterate_table): Likewise. (lookup): Likewise. * login/forkpty.c (forkpty): Likewise. * misc/hsearch_r.c (__hsearch_r): Likewise. * misc/select.c (__select): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore): Likewise. * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0): Likewise. * nptl/old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0): Likewise. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_getpshared.c (pthread_barrierattr_getpshared): Likewise. * nptl/pthread_getschedparam.c (__pthread_getschedparam): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * nptl/pthread_setschedparam.c (__pthread_setschedparam): Likewise. * socket/recvfrom.c (__recvfrom): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * stdio-common/_itoa.c (_itoa): Likewise. * stdio-common/_itowa.c (_itowa): Likewise. * stdio-common/reg-printf.c (__register_printf_specifier): Likewise. (__register_printf_function): Likewise. * stdio-common/tempname.c (__path_search): Likewise. * stdlib/addmul_1.c (mpn_addmul_1): Likewise. * stdlib/mul_1.c (mpn_mul_1): Likewise. * stdlib/random_r.c (__initstate_r): Likewise. * stdlib/setenv.c (__add_to_environ): Likewise. * stdlib/submul_1.c (mpn_submul_1): Likewise. * streams/getpmsg.c (getpmsg): Likewise. * streams/putmsg.c (putmsg): Likewise. * streams/putpmsg.c (putpmsg): Likewise. * sunrpc/clnt_raw.c (clntraw_call): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. * sunrpc/clnt_udp.c (clntudp_create): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. * sunrpc/pm_getport.c (pmap_getport): Likewise. * sunrpc/svc_udp.c (cache_get): Likewise. * sunrpc/xdr_array.c (xdr_vector): Likewise. * sysdeps/mach/hurd/getcwd.c (__canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/pselect.c (__pselect): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/sparc/nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise. * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Likewise. * sysvipc/semtimedop.c (semtimedop): Likewise. * time/setitimer.c (__setitimer): Likewise. * time/strftime_l.c (emacs_strftime): Likewise.
137 lines
4.0 KiB
C
137 lines
4.0 KiB
C
/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sysdep.h>
|
|
#include <lowlevellock.h>
|
|
#include <futex-internal.h>
|
|
#include <pthread.h>
|
|
#include <pthreadP.h>
|
|
#include <sys/time.h>
|
|
#include <stdbool.h>
|
|
|
|
|
|
/* Try to acquire read lock for RWLOCK or return after specfied time. */
|
|
int
|
|
pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
|
|
const struct timespec *abstime)
|
|
{
|
|
int result = 0;
|
|
bool wake = false;
|
|
int futex_shared =
|
|
rwlock->__data.__shared == LLL_PRIVATE ? FUTEX_PRIVATE : FUTEX_SHARED;
|
|
|
|
/* Make sure we are alone. */
|
|
lll_lock(rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
while (1)
|
|
{
|
|
int err;
|
|
|
|
/* Get the rwlock if there is no writer... */
|
|
if (rwlock->__data.__writer == 0
|
|
/* ...and if either no writer is waiting or we prefer readers. */
|
|
&& (!rwlock->__data.__nr_writers_queued
|
|
|| PTHREAD_RWLOCK_PREFER_READER_P (rwlock)))
|
|
{
|
|
/* Increment the reader counter. Avoid overflow. */
|
|
if (++rwlock->__data.__nr_readers == 0)
|
|
{
|
|
/* Overflow on number of readers. */
|
|
--rwlock->__data.__nr_readers;
|
|
result = EAGAIN;
|
|
}
|
|
else
|
|
{
|
|
/* See pthread_rwlock_rdlock. */
|
|
if (rwlock->__data.__nr_readers == 1
|
|
&& rwlock->__data.__nr_readers_queued > 0
|
|
&& rwlock->__data.__nr_writers_queued > 0)
|
|
{
|
|
++rwlock->__data.__readers_wakeup;
|
|
wake = true;
|
|
}
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
/* Make sure we are not holding the rwlock as a writer. This is
|
|
a deadlock situation we recognize and report. */
|
|
if (__builtin_expect (rwlock->__data.__writer
|
|
== THREAD_GETMEM (THREAD_SELF, tid), 0))
|
|
{
|
|
result = EDEADLK;
|
|
break;
|
|
}
|
|
|
|
/* Make sure the passed in timeout value is valid. Ideally this
|
|
test would be executed once. But since it must not be
|
|
performed if we would not block at all simply moving the test
|
|
to the front is no option. Replicating all the code is
|
|
costly while this test is not. */
|
|
if (__builtin_expect (abstime->tv_nsec >= 1000000000
|
|
|| abstime->tv_nsec < 0, 0))
|
|
{
|
|
result = EINVAL;
|
|
break;
|
|
}
|
|
|
|
/* Remember that we are a reader. */
|
|
if (++rwlock->__data.__nr_readers_queued == 0)
|
|
{
|
|
/* Overflow on number of queued readers. */
|
|
--rwlock->__data.__nr_readers_queued;
|
|
result = EAGAIN;
|
|
break;
|
|
}
|
|
|
|
int waitval = rwlock->__data.__readers_wakeup;
|
|
|
|
/* Free the lock. */
|
|
lll_unlock (rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
/* Wait for the writer to finish. We handle ETIMEDOUT below; on other
|
|
return values, we decide how to continue based on the state of the
|
|
rwlock. */
|
|
err = futex_abstimed_wait (&rwlock->__data.__readers_wakeup, waitval,
|
|
abstime, futex_shared);
|
|
|
|
/* Get the lock. */
|
|
lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
--rwlock->__data.__nr_readers_queued;
|
|
|
|
/* Did the futex call time out? */
|
|
if (err == ETIMEDOUT)
|
|
{
|
|
/* Yep, report it. */
|
|
result = ETIMEDOUT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* We are done, free the lock. */
|
|
lll_unlock (rwlock->__data.__lock, rwlock->__data.__shared);
|
|
|
|
if (wake)
|
|
futex_wake (&rwlock->__data.__readers_wakeup, INT_MAX, futex_shared);
|
|
|
|
return result;
|
|
}
|