mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 19:30:10 +00: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.
257 lines
6.5 KiB
C
257 lines
6.5 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 (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)
|