mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +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.
453 lines
9.9 KiB
C
453 lines
9.9 KiB
C
#include <stdlib.h>
|
||
#include <string.h>
|
||
|
||
#include "hurdmalloc.h" /* XXX see that file */
|
||
|
||
#include <mach.h>
|
||
#define vm_allocate __vm_allocate
|
||
#define vm_page_size __vm_page_size
|
||
|
||
/*
|
||
* Mach Operating System
|
||
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
|
||
* All Rights Reserved.
|
||
*
|
||
* Permission to use, copy, modify and distribute this software and its
|
||
* documentation is hereby granted, provided that both the copyright
|
||
* notice and this permission notice appear in all copies of the
|
||
* software, derivative works or modified versions, and any portions
|
||
* thereof, and that both notices appear in supporting documentation.
|
||
*
|
||
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
|
||
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
|
||
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
|
||
*
|
||
* Carnegie Mellon requests users of this software to return to
|
||
*
|
||
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
|
||
* School of Computer Science
|
||
* Carnegie Mellon University
|
||
* Pittsburgh PA 15213-3890
|
||
*
|
||
* any improvements or extensions that they make and grant Carnegie Mellon
|
||
* the rights to redistribute these changes.
|
||
*/
|
||
/*
|
||
* (pre-GNU) HISTORY
|
||
*
|
||
* Revision 2.7 91/05/14 17:57:34 mrt
|
||
* Correcting copyright
|
||
*
|
||
* Revision 2.6 91/02/14 14:20:26 mrt
|
||
* Added new Mach copyright
|
||
* [91/02/13 12:41:21 mrt]
|
||
*
|
||
* Revision 2.5 90/11/05 14:37:33 rpd
|
||
* Added malloc_fork* code.
|
||
* [90/11/02 rwd]
|
||
*
|
||
* Add spin_lock_t.
|
||
* [90/10/31 rwd]
|
||
*
|
||
* Revision 2.4 90/08/07 14:31:28 rpd
|
||
* Removed RCS keyword nonsense.
|
||
*
|
||
* Revision 2.3 90/06/02 15:14:00 rpd
|
||
* Converted to new IPC.
|
||
* [90/03/20 20:56:57 rpd]
|
||
*
|
||
* Revision 2.2 89/12/08 19:53:59 rwd
|
||
* Removed conditionals.
|
||
* [89/10/23 rwd]
|
||
*
|
||
* Revision 2.1 89/08/03 17:09:46 rwd
|
||
* Created.
|
||
*
|
||
*
|
||
* 13-Sep-88 Eric Cooper (ecc) at Carnegie Mellon University
|
||
* Changed realloc() to copy min(old size, new size) bytes.
|
||
* Bug found by Mike Kupfer at Olivetti.
|
||
*/
|
||
/*
|
||
* File: malloc.c
|
||
* Author: Eric Cooper, Carnegie Mellon University
|
||
* Date: July, 1988
|
||
*
|
||
* Memory allocator for use with multiple threads.
|
||
*/
|
||
|
||
|
||
#include <assert.h>
|
||
|
||
#include <cthreads.h>
|
||
|
||
#define MCHECK
|
||
|
||
/*
|
||
* Structure of memory block header.
|
||
* When free, next points to next block on free list.
|
||
* When allocated, fl points to free list.
|
||
* Size of header is 4 bytes, so minimum usable block size is 8 bytes.
|
||
*/
|
||
|
||
#define CHECK_BUSY 0x8a3c743e
|
||
#define CHECK_FREE 0x66688b92
|
||
|
||
#ifdef MCHECK
|
||
|
||
typedef struct header {
|
||
long check;
|
||
union {
|
||
struct header *next;
|
||
struct free_list *fl;
|
||
} u;
|
||
} *header_t;
|
||
|
||
#define HEADER_SIZE sizeof (struct header)
|
||
#define HEADER_NEXT(h) ((h)->u.next)
|
||
#define HEADER_FREE(h) ((h)->u.fl)
|
||
#define HEADER_CHECK(h) ((h)->check)
|
||
#define MIN_SIZE 16
|
||
#define LOG2_MIN_SIZE 4
|
||
|
||
#else /* ! MCHECK */
|
||
|
||
typedef union header {
|
||
union header *next;
|
||
struct free_list *fl;
|
||
} *header_t;
|
||
|
||
#define HEADER_SIZE sizeof (union header)
|
||
#define HEADER_NEXT(h) ((h)->next)
|
||
#define HEADER_FREE(h) ((h)->fl)
|
||
#define MIN_SIZE 8 /* minimum block size */
|
||
#define LOG2_MIN_SIZE 3
|
||
|
||
#endif /* MCHECK */
|
||
|
||
typedef struct free_list {
|
||
spin_lock_t lock; /* spin lock for mutual exclusion */
|
||
header_t head; /* head of free list for this size */
|
||
#ifdef DEBUG
|
||
int in_use; /* # mallocs - # frees */
|
||
#endif /* DEBUG */
|
||
} *free_list_t;
|
||
|
||
/*
|
||
* Free list with index i contains blocks of size 2 ^ (i + LOG2_MIN_SIZE)
|
||
* including header. Smallest block size is MIN_SIZE, with MIN_SIZE -
|
||
* HEADER_SIZE bytes available to user. Size argument to malloc is a signed
|
||
* integer for sanity checking, so largest block size is 2^31.
|
||
*/
|
||
#define NBUCKETS 29
|
||
|
||
static struct free_list malloc_free_list[NBUCKETS];
|
||
|
||
/* Initialization just sets everything to zero, but might be necessary on a
|
||
machine where spin_lock_init does otherwise, and is necessary when
|
||
running an executable that was written by something like Emacs's unexec.
|
||
It preserves the values of data variables like malloc_free_list, but
|
||
does not save the vm_allocate'd space allocated by this malloc. */
|
||
|
||
static void
|
||
malloc_init (void)
|
||
{
|
||
int i;
|
||
for (i = 0; i < NBUCKETS; ++i)
|
||
{
|
||
spin_lock_init (&malloc_free_list[i].lock);
|
||
malloc_free_list[i].head = NULL;
|
||
#ifdef DEBUG
|
||
malloc_free_list[i].in_use = 0;
|
||
#endif
|
||
}
|
||
|
||
/* This not only suppresses a `defined but not used' warning,
|
||
but it is ABSOLUTELY NECESSARY to avoid the hyperclever
|
||
compiler from "optimizing out" the entire function! */
|
||
(void) &malloc_init;
|
||
}
|
||
|
||
static void
|
||
more_memory(int size, free_list_t fl)
|
||
{
|
||
int amount;
|
||
int n;
|
||
vm_address_t where;
|
||
header_t h;
|
||
kern_return_t r;
|
||
|
||
if (size <= vm_page_size) {
|
||
amount = vm_page_size;
|
||
n = vm_page_size / size;
|
||
/* We lose vm_page_size - n*size bytes here. */
|
||
} else {
|
||
amount = size;
|
||
n = 1;
|
||
}
|
||
|
||
r = vm_allocate(mach_task_self(), &where, (vm_size_t) amount, TRUE);
|
||
assert_perror (r);
|
||
|
||
h = (header_t) where;
|
||
do {
|
||
HEADER_NEXT (h) = fl->head;
|
||
#ifdef MCHECK
|
||
HEADER_CHECK (h) = CHECK_FREE;
|
||
#endif
|
||
fl->head = h;
|
||
h = (header_t) ((char *) h + size);
|
||
} while (--n != 0);
|
||
}
|
||
|
||
/* Declaration changed to standard one for GNU. */
|
||
void *
|
||
malloc (size_t size)
|
||
{
|
||
int i, n;
|
||
free_list_t fl;
|
||
header_t h;
|
||
|
||
if ((int) size < 0) /* sanity check */
|
||
return 0;
|
||
size += HEADER_SIZE;
|
||
/*
|
||
* Find smallest power-of-two block size
|
||
* big enough to hold requested size plus header.
|
||
*/
|
||
i = 0;
|
||
n = MIN_SIZE;
|
||
while (n < size) {
|
||
i += 1;
|
||
n <<= 1;
|
||
}
|
||
ASSERT(i < NBUCKETS);
|
||
fl = &malloc_free_list[i];
|
||
spin_lock(&fl->lock);
|
||
h = fl->head;
|
||
if (h == 0) {
|
||
/*
|
||
* Free list is empty;
|
||
* allocate more blocks.
|
||
*/
|
||
more_memory(n, fl);
|
||
h = fl->head;
|
||
if (h == 0) {
|
||
/*
|
||
* Allocation failed.
|
||
*/
|
||
spin_unlock(&fl->lock);
|
||
return 0;
|
||
}
|
||
}
|
||
/*
|
||
* Pop block from free list.
|
||
*/
|
||
fl->head = HEADER_NEXT (h);
|
||
|
||
#ifdef MCHECK
|
||
assert (HEADER_CHECK (h) == CHECK_FREE);
|
||
HEADER_CHECK (h) = CHECK_BUSY;
|
||
#endif
|
||
|
||
#ifdef DEBUG
|
||
fl->in_use += 1;
|
||
#endif /* DEBUG */
|
||
spin_unlock(&fl->lock);
|
||
/*
|
||
* Store free list pointer in block header
|
||
* so we can figure out where it goes
|
||
* at free() time.
|
||
*/
|
||
HEADER_FREE (h) = fl;
|
||
/*
|
||
* Return pointer past the block header.
|
||
*/
|
||
return ((char *) h) + HEADER_SIZE;
|
||
}
|
||
|
||
/* Declaration changed to standard one for GNU. */
|
||
void
|
||
free (void *base)
|
||
{
|
||
header_t h;
|
||
free_list_t fl;
|
||
int i;
|
||
|
||
if (base == 0)
|
||
return;
|
||
/*
|
||
* Find free list for block.
|
||
*/
|
||
h = (header_t) (base - HEADER_SIZE);
|
||
|
||
#ifdef MCHECK
|
||
assert (HEADER_CHECK (h) == CHECK_BUSY);
|
||
#endif
|
||
|
||
fl = HEADER_FREE (h);
|
||
i = fl - malloc_free_list;
|
||
/*
|
||
* Sanity checks.
|
||
*/
|
||
if (i < 0 || i >= NBUCKETS) {
|
||
ASSERT(0 <= i && i < NBUCKETS);
|
||
return;
|
||
}
|
||
if (fl != &malloc_free_list[i]) {
|
||
ASSERT(fl == &malloc_free_list[i]);
|
||
return;
|
||
}
|
||
/*
|
||
* Push block on free list.
|
||
*/
|
||
spin_lock(&fl->lock);
|
||
HEADER_NEXT (h) = fl->head;
|
||
#ifdef MCHECK
|
||
HEADER_CHECK (h) = CHECK_FREE;
|
||
#endif
|
||
fl->head = h;
|
||
#ifdef DEBUG
|
||
fl->in_use -= 1;
|
||
#endif /* DEBUG */
|
||
spin_unlock(&fl->lock);
|
||
return;
|
||
}
|
||
|
||
/* Declaration changed to standard one for GNU. */
|
||
void *
|
||
realloc (void *old_base, size_t new_size)
|
||
{
|
||
header_t h;
|
||
free_list_t fl;
|
||
int i;
|
||
unsigned int old_size;
|
||
char *new_base;
|
||
|
||
if (old_base == 0)
|
||
return malloc (new_size);
|
||
|
||
/*
|
||
* Find size of old block.
|
||
*/
|
||
h = (header_t) (old_base - HEADER_SIZE);
|
||
#ifdef MCHECK
|
||
assert (HEADER_CHECK (h) == CHECK_BUSY);
|
||
#endif
|
||
fl = HEADER_FREE (h);
|
||
i = fl - malloc_free_list;
|
||
/*
|
||
* Sanity checks.
|
||
*/
|
||
if (i < 0 || i >= NBUCKETS) {
|
||
ASSERT(0 <= i && i < NBUCKETS);
|
||
return 0;
|
||
}
|
||
if (fl != &malloc_free_list[i]) {
|
||
ASSERT(fl == &malloc_free_list[i]);
|
||
return 0;
|
||
}
|
||
/*
|
||
* Free list with index i contains blocks of size
|
||
* 2 ^ (i + * LOG2_MIN_SIZE) including header.
|
||
*/
|
||
old_size = (1 << (i + LOG2_MIN_SIZE)) - HEADER_SIZE;
|
||
|
||
if (new_size <= old_size
|
||
&& new_size > (((old_size + HEADER_SIZE) >> 1) - HEADER_SIZE))
|
||
/* The new size still fits in the same block, and wouldn't fit in
|
||
the next smaller block! */
|
||
return old_base;
|
||
|
||
/*
|
||
* Allocate new block, copy old bytes, and free old block.
|
||
*/
|
||
new_base = malloc(new_size);
|
||
if (new_base)
|
||
memcpy (new_base, old_base,
|
||
(int) (old_size < new_size ? old_size : new_size));
|
||
|
||
if (new_base || new_size == 0)
|
||
/* Free OLD_BASE, but only if the malloc didn't fail. */
|
||
free (old_base);
|
||
|
||
return new_base;
|
||
}
|
||
|
||
#ifdef DEBUG
|
||
void
|
||
print_malloc_free_list (void)
|
||
{
|
||
int i, size;
|
||
free_list_t fl;
|
||
int n;
|
||
header_t h;
|
||
int total_used = 0;
|
||
int total_free = 0;
|
||
|
||
fprintf(stderr, " Size In Use Free Total\n");
|
||
for (i = 0, size = MIN_SIZE, fl = malloc_free_list;
|
||
i < NBUCKETS;
|
||
i += 1, size <<= 1, fl += 1) {
|
||
spin_lock(&fl->lock);
|
||
if (fl->in_use != 0 || fl->head != 0) {
|
||
total_used += fl->in_use * size;
|
||
for (n = 0, h = fl->head; h != 0; h = HEADER_NEXT (h), n += 1)
|
||
;
|
||
total_free += n * size;
|
||
fprintf(stderr, "%10d %10d %10d %10d\n",
|
||
size, fl->in_use, n, fl->in_use + n);
|
||
}
|
||
spin_unlock(&fl->lock);
|
||
}
|
||
fprintf(stderr, " all sizes %10d %10d %10d\n",
|
||
total_used, total_free, total_used + total_free);
|
||
}
|
||
#endif /* DEBUG */
|
||
|
||
static void
|
||
malloc_fork_prepare(void)
|
||
/*
|
||
* Prepare the malloc module for a fork by insuring that no thread is in a
|
||
* malloc critical section.
|
||
*/
|
||
{
|
||
int i;
|
||
|
||
for (i = 0; i < NBUCKETS; i++) {
|
||
spin_lock(&malloc_free_list[i].lock);
|
||
}
|
||
}
|
||
|
||
static void
|
||
malloc_fork_parent(void)
|
||
/*
|
||
* Called in the parent process after a fork() to resume normal operation.
|
||
*/
|
||
{
|
||
int i;
|
||
|
||
for (i = NBUCKETS-1; i >= 0; i--) {
|
||
spin_unlock(&malloc_free_list[i].lock);
|
||
}
|
||
}
|
||
|
||
static void
|
||
malloc_fork_child(void)
|
||
/*
|
||
* Called in the child process after a fork() to resume normal operation.
|
||
*/
|
||
{
|
||
int i;
|
||
|
||
for (i = NBUCKETS-1; i >= 0; i--) {
|
||
spin_unlock(&malloc_free_list[i].lock);
|
||
}
|
||
}
|
||
|
||
|
||
text_set_element (_hurd_fork_prepare_hook, malloc_fork_prepare);
|
||
text_set_element (_hurd_fork_parent_hook, malloc_fork_parent);
|
||
text_set_element (_hurd_fork_child_hook, malloc_fork_child);
|
||
text_set_element (_hurd_preinit_hook, malloc_init);
|