mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +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.
196 lines
5.4 KiB
C
196 lines
5.4 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 <inttypes.h>
|
|
#include <stdio.h>
|
|
#include <stdio_ext.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/resource.h>
|
|
#include "pthreadP.h"
|
|
#include <lowlevellock.h>
|
|
#include <ldsodefs.h>
|
|
|
|
|
|
int
|
|
pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
|
|
{
|
|
struct pthread *thread = (struct pthread *) thread_id;
|
|
struct pthread_attr *iattr = (struct pthread_attr *) attr;
|
|
int ret = 0;
|
|
|
|
lll_lock (thread->lock, LLL_PRIVATE);
|
|
|
|
/* The thread library is responsible for keeping the values in the
|
|
thread desriptor up-to-date in case the user changes them. */
|
|
memcpy (&iattr->schedparam, &thread->schedparam,
|
|
sizeof (struct sched_param));
|
|
iattr->schedpolicy = thread->schedpolicy;
|
|
|
|
/* Clear the flags work. */
|
|
iattr->flags = thread->flags;
|
|
|
|
/* The thread might be detached by now. */
|
|
if (IS_DETACHED (thread))
|
|
iattr->flags |= ATTR_FLAG_DETACHSTATE;
|
|
|
|
/* This is the guardsize after adjusting it. */
|
|
iattr->guardsize = thread->reported_guardsize;
|
|
|
|
/* The sizes are subject to alignment. */
|
|
if (__glibc_likely (thread->stackblock != NULL))
|
|
{
|
|
iattr->stacksize = thread->stackblock_size;
|
|
iattr->stackaddr = (char *) thread->stackblock + iattr->stacksize;
|
|
}
|
|
else
|
|
{
|
|
/* No stack information available. This must be for the initial
|
|
thread. Get the info in some magical way. */
|
|
assert (abs (thread->pid) == thread->tid);
|
|
|
|
/* Stack size limit. */
|
|
struct rlimit rl;
|
|
|
|
/* The safest way to get the top of the stack is to read
|
|
/proc/self/maps and locate the line into which
|
|
__libc_stack_end falls. */
|
|
FILE *fp = fopen ("/proc/self/maps", "rce");
|
|
if (fp == NULL)
|
|
ret = errno;
|
|
/* We need the limit of the stack in any case. */
|
|
else
|
|
{
|
|
if (getrlimit (RLIMIT_STACK, &rl) != 0)
|
|
ret = errno;
|
|
else
|
|
{
|
|
/* We consider the main process stack to have ended with
|
|
the page containing __libc_stack_end. There is stuff below
|
|
it in the stack too, like the program arguments, environment
|
|
variables and auxv info, but we ignore those pages when
|
|
returning size so that the output is consistent when the
|
|
stack is marked executable due to a loaded DSO requiring
|
|
it. */
|
|
void *stack_end = (void *) ((uintptr_t) __libc_stack_end
|
|
& -(uintptr_t) GLRO(dl_pagesize));
|
|
#if _STACK_GROWS_DOWN
|
|
stack_end += GLRO(dl_pagesize);
|
|
#endif
|
|
/* We need no locking. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
|
|
/* Until we found an entry (which should always be the case)
|
|
mark the result as a failure. */
|
|
ret = ENOENT;
|
|
|
|
char *line = NULL;
|
|
size_t linelen = 0;
|
|
uintptr_t last_to = 0;
|
|
|
|
while (! feof_unlocked (fp))
|
|
{
|
|
if (__getdelim (&line, &linelen, '\n', fp) <= 0)
|
|
break;
|
|
|
|
uintptr_t from;
|
|
uintptr_t to;
|
|
if (sscanf (line, "%" SCNxPTR "-%" SCNxPTR, &from, &to) != 2)
|
|
continue;
|
|
if (from <= (uintptr_t) __libc_stack_end
|
|
&& (uintptr_t) __libc_stack_end < to)
|
|
{
|
|
/* Found the entry. Now we have the info we need. */
|
|
iattr->stackaddr = stack_end;
|
|
iattr->stacksize =
|
|
rl.rlim_cur - (size_t) (to - (uintptr_t) stack_end);
|
|
|
|
/* Cut it down to align it to page size since otherwise we
|
|
risk going beyond rlimit when the kernel rounds up the
|
|
stack extension request. */
|
|
iattr->stacksize = (iattr->stacksize
|
|
& -(intptr_t) GLRO(dl_pagesize));
|
|
|
|
/* The limit might be too high. */
|
|
if ((size_t) iattr->stacksize
|
|
> (size_t) iattr->stackaddr - last_to)
|
|
iattr->stacksize = (size_t) iattr->stackaddr - last_to;
|
|
|
|
/* We succeed and no need to look further. */
|
|
ret = 0;
|
|
break;
|
|
}
|
|
last_to = to;
|
|
}
|
|
|
|
free (line);
|
|
}
|
|
|
|
fclose (fp);
|
|
}
|
|
}
|
|
|
|
iattr->flags |= ATTR_FLAG_STACKADDR;
|
|
|
|
if (ret == 0)
|
|
{
|
|
size_t size = 16;
|
|
cpu_set_t *cpuset = NULL;
|
|
|
|
do
|
|
{
|
|
size <<= 1;
|
|
|
|
void *newp = realloc (cpuset, size);
|
|
if (newp == NULL)
|
|
{
|
|
ret = ENOMEM;
|
|
break;
|
|
}
|
|
cpuset = (cpu_set_t *) newp;
|
|
|
|
ret = __pthread_getaffinity_np (thread_id, size, cpuset);
|
|
}
|
|
/* Pick some ridiculous upper limit. Is 8 million CPUs enough? */
|
|
while (ret == EINVAL && size < 1024 * 1024);
|
|
|
|
if (ret == 0)
|
|
{
|
|
iattr->cpuset = cpuset;
|
|
iattr->cpusetsize = size;
|
|
}
|
|
else
|
|
{
|
|
free (cpuset);
|
|
if (ret == ENOSYS)
|
|
{
|
|
/* There is no such functionality. */
|
|
ret = 0;
|
|
iattr->cpuset = NULL;
|
|
iattr->cpusetsize = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
lll_unlock (thread->lock, LLL_PRIVATE);
|
|
|
|
return ret;
|
|
}
|