mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
259 lines
6.6 KiB
C
259 lines
6.6 KiB
C
/* Suspend until termination of a requests.
|
|
Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
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/>. */
|
|
|
|
|
|
/* We use an UGLY hack to prevent gcc from finding us cheating. The
|
|
implementations of aio_suspend and aio_suspend64 are identical and so
|
|
we want to avoid code duplication by using aliases. But gcc sees
|
|
the different parameter lists and prints a warning. We define here
|
|
a function so that aio_suspend64 has no prototype. */
|
|
#define aio_suspend64 XXX
|
|
#include <aio.h>
|
|
/* And undo the hack. */
|
|
#undef aio_suspend64
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <sys/time.h>
|
|
|
|
#include <libc-lock.h>
|
|
#include <aio_misc.h>
|
|
|
|
|
|
struct clparam
|
|
{
|
|
const struct aiocb *const *list;
|
|
struct waitlist *waitlist;
|
|
struct requestlist **requestlist;
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
pthread_cond_t *cond;
|
|
#endif
|
|
int nent;
|
|
};
|
|
|
|
|
|
static void
|
|
cleanup (void *arg)
|
|
{
|
|
#ifdef DONT_NEED_AIO_MISC_COND
|
|
/* Acquire the mutex. If pthread_cond_*wait is used this would
|
|
happen implicitly. */
|
|
pthread_mutex_lock (&__aio_requests_mutex);
|
|
#endif
|
|
|
|
const struct clparam *param = (const struct clparam *) arg;
|
|
|
|
/* Now remove the entry in the waiting list for all requests
|
|
which didn't terminate. */
|
|
int cnt = param->nent;
|
|
while (cnt-- > 0)
|
|
if (param->list[cnt] != NULL
|
|
&& param->list[cnt]->__error_code == EINPROGRESS)
|
|
{
|
|
struct waitlist **listp;
|
|
|
|
assert (param->requestlist[cnt] != NULL);
|
|
|
|
/* There is the chance that we cannot find our entry anymore. This
|
|
could happen if the request terminated and restarted again. */
|
|
listp = ¶m->requestlist[cnt]->waiting;
|
|
while (*listp != NULL && *listp != ¶m->waitlist[cnt])
|
|
listp = &(*listp)->next;
|
|
|
|
if (*listp != NULL)
|
|
*listp = (*listp)->next;
|
|
}
|
|
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
/* Release the conditional variable. */
|
|
(void) pthread_cond_destroy (param->cond);
|
|
#endif
|
|
|
|
/* Release the mutex. */
|
|
pthread_mutex_unlock (&__aio_requests_mutex);
|
|
}
|
|
|
|
#ifdef DONT_NEED_AIO_MISC_COND
|
|
static int
|
|
__attribute__ ((noinline))
|
|
do_aio_misc_wait (unsigned int *cntr, const struct timespec *timeout)
|
|
{
|
|
int result = 0;
|
|
|
|
AIO_MISC_WAIT (result, *cntr, timeout, 1);
|
|
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
int
|
|
aio_suspend (list, nent, timeout)
|
|
const struct aiocb *const list[];
|
|
int nent;
|
|
const struct timespec *timeout;
|
|
{
|
|
if (__glibc_unlikely (nent < 0))
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
struct waitlist waitlist[nent];
|
|
struct requestlist *requestlist[nent];
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
|
|
#endif
|
|
int cnt;
|
|
bool any = false;
|
|
int result = 0;
|
|
unsigned int cntr = 1;
|
|
|
|
/* Request the mutex. */
|
|
pthread_mutex_lock (&__aio_requests_mutex);
|
|
|
|
/* There is not yet a finished request. Signal the request that
|
|
we are working for it. */
|
|
for (cnt = 0; cnt < nent; ++cnt)
|
|
if (list[cnt] != NULL)
|
|
{
|
|
if (list[cnt]->__error_code == EINPROGRESS)
|
|
{
|
|
requestlist[cnt] = __aio_find_req ((aiocb_union *) list[cnt]);
|
|
|
|
if (requestlist[cnt] != NULL)
|
|
{
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
waitlist[cnt].cond = &cond;
|
|
#endif
|
|
waitlist[cnt].result = NULL;
|
|
waitlist[cnt].next = requestlist[cnt]->waiting;
|
|
waitlist[cnt].counterp = &cntr;
|
|
waitlist[cnt].sigevp = NULL;
|
|
#ifdef BROKEN_THREAD_SIGNALS
|
|
waitlist[cnt].caller_pid = 0; /* Not needed. */
|
|
#endif
|
|
requestlist[cnt]->waiting = &waitlist[cnt];
|
|
any = true;
|
|
}
|
|
else
|
|
/* We will never suspend. */
|
|
break;
|
|
}
|
|
else
|
|
/* We will never suspend. */
|
|
break;
|
|
}
|
|
|
|
|
|
/* Only if none of the entries is NULL or finished to be wait. */
|
|
if (cnt == nent && any)
|
|
{
|
|
struct clparam clparam =
|
|
{
|
|
.list = list,
|
|
.waitlist = waitlist,
|
|
.requestlist = requestlist,
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
.cond = &cond,
|
|
#endif
|
|
.nent = nent
|
|
};
|
|
|
|
pthread_cleanup_push (cleanup, &clparam);
|
|
|
|
#ifdef DONT_NEED_AIO_MISC_COND
|
|
result = do_aio_misc_wait (&cntr, timeout);
|
|
#else
|
|
if (timeout == NULL)
|
|
result = pthread_cond_wait (&cond, &__aio_requests_mutex);
|
|
else
|
|
{
|
|
/* We have to convert the relative timeout value into an
|
|
absolute time value with pthread_cond_timedwait expects. */
|
|
struct timeval now;
|
|
struct timespec abstime;
|
|
|
|
__gettimeofday (&now, NULL);
|
|
abstime.tv_nsec = timeout->tv_nsec + now.tv_usec * 1000;
|
|
abstime.tv_sec = timeout->tv_sec + now.tv_sec;
|
|
if (abstime.tv_nsec >= 1000000000)
|
|
{
|
|
abstime.tv_nsec -= 1000000000;
|
|
abstime.tv_sec += 1;
|
|
}
|
|
|
|
result = pthread_cond_timedwait (&cond, &__aio_requests_mutex,
|
|
&abstime);
|
|
}
|
|
#endif
|
|
|
|
pthread_cleanup_pop (0);
|
|
}
|
|
|
|
/* Now remove the entry in the waiting list for all requests
|
|
which didn't terminate. */
|
|
while (cnt-- > 0)
|
|
if (list[cnt] != NULL && list[cnt]->__error_code == EINPROGRESS)
|
|
{
|
|
struct waitlist **listp;
|
|
|
|
assert (requestlist[cnt] != NULL);
|
|
|
|
/* There is the chance that we cannot find our entry anymore. This
|
|
could happen if the request terminated and restarted again. */
|
|
listp = &requestlist[cnt]->waiting;
|
|
while (*listp != NULL && *listp != &waitlist[cnt])
|
|
listp = &(*listp)->next;
|
|
|
|
if (*listp != NULL)
|
|
*listp = (*listp)->next;
|
|
}
|
|
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
/* Release the conditional variable. */
|
|
if (__glibc_unlikely (pthread_cond_destroy (&cond) != 0))
|
|
/* This must never happen. */
|
|
abort ();
|
|
#endif
|
|
|
|
if (result != 0)
|
|
{
|
|
#ifndef DONT_NEED_AIO_MISC_COND
|
|
/* An error occurred. Possibly it's ETIMEDOUT. We have to translate
|
|
the timeout error report of `pthread_cond_timedwait' to the
|
|
form expected from `aio_suspend'. */
|
|
if (result == ETIMEDOUT)
|
|
__set_errno (EAGAIN);
|
|
else
|
|
#endif
|
|
__set_errno (result);
|
|
|
|
result = -1;
|
|
}
|
|
|
|
/* Release the mutex. */
|
|
pthread_mutex_unlock (&__aio_requests_mutex);
|
|
|
|
return result;
|
|
}
|
|
|
|
weak_alias (aio_suspend, aio_suspend64)
|