mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
bd355af04f
1997-12-14 21:33 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 2.0.91. * db2/makedb.c (process_input): Fix typo in message. * sunrpc/rpcinfo.c (pmapdump): Unify messages. * elf/dynamic-link.h: Pretty print. * elf/rtld.c: Allow multiple preloading of a shared object. * include/limits.h: Prevent multiple inclusion. * malloc/Makefile (headers): Add mcheck.h. (distribute): Remove it here. * malloc/mcheck.h: Pretty print. * malloc/mtrace.c (mallenv): Make `const'. * malloc/mtrace.pl: Don't print table head for memory leaks if there are none. * manual/memory.texi: Update descriptor of malloc hooks. * posix/Makefile (routines): Add waitid. * posix/sys/types.h [__USE_SVID || __USE_POSIX]: Define id_t based on __id_t. * posix/sys/wait.h: Define idtype_t type. Add prototype for waitid. * signal/signal.h: Move definition of sigval_t to <bits/siginfo.h>. * sysdeps/generic/waitid.c: Stub for waitid. * sysdeps/generic/bits/siginfo.h: Define sigval_t. Arrange to work the __need_siginfo_t defined. * sysdeps/unix/sysv/linux/bits/siginfo: Likewise. * sysdeps/generic/bits/types.h: Define __id_t. Correct definition of __FDMASK. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/posix/waitid.c: New file. Provided by Zack Weinberg. * rt/aio_misc.c: Rename __aio_free_req to __aio_free_request. * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add missing parameters. * sysdeps/generic/dl-sysdep.c: Don't call __libc_init_secure. * sysdeps/generic/enbl-secure.c: Don't define __libc_uid. * sysdeps/unix/sysv/linux/init-first.c: Define __libc_uid. * sysdeps/unix/sysv/linux/sigqueue.c: Make sure __libc_uid is initialized. * sysdeps/i386/dl-machine.h: Little cleanup. * sysdeps/i386/fpu/bits/mathinline.h: Use __signbit* inline functions. (__finite): Mark function as const. Add inline code for __ieee754_atan2. * sysdeps/libm-ieee754/s_cacoshf.c: Add alternate implementation (but don't use it now). * sysdeps/libm-ieee754/s_catan.c: Use __ieee754_atan2 instead of __atan. * sysdeps/libm-ieee754/s_catanf.c: Likewise. * sysdeps/libm-ieee754/s_catanl.c: Likewise. * sysdeps/libm-ieee754/s_catanh.c: Likewise. Correct sign of real part. * sysdeps/libm-ieee754/s_catanhf.c: Likewise. * sysdeps/libm-ieee754/s_catanhl.c: Likewise. * sysdeps/libm-ieee754/s_clog10.c: Use factor to correct __ieee754_atan2 to base 10. * sysdeps/libm-ieee754/s_clog10f.c: Likewise. * sysdeps/libm-ieee754/s_clog10l.c: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h: Define as old_kernel_sigaction. * sysdeps/unix/sysv/linux/net/if_slip.h: Pretty print. * wctype/Makefile (routines): Add wctype_l. * wctype/wctype.h: Add declaration of __wctype_l. * wctype/wctype_l.c: New file. 1997-12-10 00:38 Ulrich Drepper <drepper@cygnus.com> * locale/C-ctype.c: Correct data for isw* functions. * locale/programs/ld-ctype.c: Write 32bit char classes in correct byte order. * wctype/test_wctype.c: Add test for isw* functions. * wctype/wctype.c: Return value with expected byte order. * sysdeps/generic/_G_config.h: Define _G_HAVE_IO_FILE_OPEN. * sysdeps/unix/sysv/linux/_G_config.h: Likewise.
277 lines
7.0 KiB
C
277 lines
7.0 KiB
C
/* More debugging hooks for `malloc'.
|
|
Copyright (C) 1991, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
|
|
Written April 2, 1991 by John Gilmore of Cygnus Support.
|
|
Based on mcheck.c by Mike Haertel.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
This 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA.
|
|
|
|
The author may be reached (Email) at the address mike@ai.mit.edu,
|
|
or (US mail) as Mike Haertel c/o Free Software Foundation. */
|
|
|
|
#ifndef _MALLOC_INTERNAL
|
|
#define _MALLOC_INTERNAL
|
|
#include <malloc.h>
|
|
#include <mcheck.h>
|
|
#include <bits/libc-lock.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_ELF
|
|
#include <link.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
#ifndef __GNU_LIBRARY__
|
|
extern char *getenv ();
|
|
#else
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
static FILE *mallstream;
|
|
static const char mallenv[]= "MALLOC_TRACE";
|
|
static char mallbuf[BUFSIZ]; /* Buffer for the output. */
|
|
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
/* Address to breakpoint on accesses to... */
|
|
__ptr_t mallwatch;
|
|
|
|
/* File name and line number information, for callers that had
|
|
the foresight to call through a macro. */
|
|
char *_mtrace_file;
|
|
int _mtrace_line;
|
|
|
|
/* Old hook values. */
|
|
static void (*tr_old_free_hook) __P ((__ptr_t ptr, const __ptr_t));
|
|
static __ptr_t (*tr_old_malloc_hook) __P ((__malloc_size_t size,
|
|
const __ptr_t));
|
|
static __ptr_t (*tr_old_realloc_hook) __P ((__ptr_t ptr,
|
|
__malloc_size_t size,
|
|
const __ptr_t));
|
|
|
|
/* This function is called when the block being alloc'd, realloc'd, or
|
|
freed has an address matching the variable "mallwatch". In a debugger,
|
|
set "mallwatch" to the address of interest, then put a breakpoint on
|
|
tr_break. */
|
|
|
|
void tr_break __P ((void));
|
|
void
|
|
tr_break ()
|
|
{
|
|
}
|
|
|
|
static void tr_where __P ((const __ptr_t)) internal_function;
|
|
static void
|
|
internal_function
|
|
tr_where (caller)
|
|
const __ptr_t caller;
|
|
{
|
|
if (_mtrace_file)
|
|
{
|
|
fprintf (mallstream, "@ %s:%d ", _mtrace_file, _mtrace_line);
|
|
_mtrace_file = NULL;
|
|
}
|
|
else if (caller != NULL)
|
|
{
|
|
#ifdef HAVE_ELF
|
|
Dl_info info;
|
|
if (_dl_addr (caller, &info))
|
|
{
|
|
fprintf (mallstream, "@ %s%s%s%s%s[%p]",
|
|
info.dli_fname ?: "", info.dli_fname ? ":" : "",
|
|
info.dli_sname ? "(" : "",
|
|
info.dli_sname ?: "", info.dli_sname ? ") " : " ",
|
|
caller);
|
|
}
|
|
else
|
|
#endif
|
|
fprintf (mallstream, "@ [%p] ", caller);
|
|
}
|
|
}
|
|
|
|
static void tr_freehook __P ((__ptr_t, const __ptr_t));
|
|
static void
|
|
tr_freehook (ptr, caller)
|
|
__ptr_t ptr;
|
|
const __ptr_t caller;
|
|
{
|
|
tr_where (caller);
|
|
/* Be sure to print it first. */
|
|
fprintf (mallstream, "- %p\n", ptr);
|
|
if (ptr == mallwatch)
|
|
tr_break ();
|
|
__libc_lock_lock (lock);
|
|
__free_hook = tr_old_free_hook;
|
|
if (tr_old_free_hook != NULL)
|
|
(*tr_old_free_hook) (ptr, caller);
|
|
else
|
|
free (ptr);
|
|
__free_hook = tr_freehook;
|
|
__libc_lock_unlock (lock);
|
|
}
|
|
|
|
static __ptr_t tr_mallochook __P ((__malloc_size_t, const __ptr_t));
|
|
static __ptr_t
|
|
tr_mallochook (size, caller)
|
|
__malloc_size_t size;
|
|
const __ptr_t caller;
|
|
{
|
|
__ptr_t hdr;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
if (tr_old_malloc_hook != NULL)
|
|
hdr = (__ptr_t) (*tr_old_malloc_hook) (size, caller);
|
|
else
|
|
hdr = (__ptr_t) malloc (size);
|
|
__malloc_hook = tr_mallochook;
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
tr_where (caller);
|
|
/* We could be printing a NULL here; that's OK. */
|
|
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long)size);
|
|
|
|
if (hdr == mallwatch)
|
|
tr_break ();
|
|
|
|
return hdr;
|
|
}
|
|
|
|
static __ptr_t tr_reallochook __P ((__ptr_t, __malloc_size_t, const __ptr_t));
|
|
static __ptr_t
|
|
tr_reallochook (ptr, size, caller)
|
|
__ptr_t ptr;
|
|
__malloc_size_t size;
|
|
const __ptr_t caller;
|
|
{
|
|
__ptr_t hdr;
|
|
|
|
if (ptr == mallwatch)
|
|
tr_break ();
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
__free_hook = tr_old_free_hook;
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
__realloc_hook = tr_old_realloc_hook;
|
|
if (tr_old_realloc_hook != NULL)
|
|
hdr = (__ptr_t) (*tr_old_realloc_hook) (ptr, size, caller);
|
|
else
|
|
hdr = (__ptr_t) realloc (ptr, size);
|
|
__free_hook = tr_freehook;
|
|
__malloc_hook = tr_mallochook;
|
|
__realloc_hook = tr_reallochook;
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
tr_where (caller);
|
|
if (hdr == NULL)
|
|
/* Failed realloc. */
|
|
fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long)size);
|
|
else if (ptr == NULL)
|
|
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long)size);
|
|
else
|
|
fprintf (mallstream, "< %p\n> %p %#lx\n", ptr, hdr, (unsigned long)size);
|
|
|
|
if (hdr == mallwatch)
|
|
tr_break ();
|
|
|
|
return hdr;
|
|
}
|
|
|
|
|
|
#ifdef _LIBC
|
|
extern void __libc_freeres (void);
|
|
|
|
/* This function gets called to make sure all memory the library
|
|
allocates get freed and so does not irritate the user when studying
|
|
the mtrace output. */
|
|
static void
|
|
release_libc_mem (void)
|
|
{
|
|
/* Only call the free function if we still are running in mtrace mode. */
|
|
if (mallstream != NULL)
|
|
__libc_freeres ();
|
|
}
|
|
#endif
|
|
|
|
|
|
/* We enable tracing if either the environment variable MALLOC_TRACE
|
|
is set, or if the variable mallwatch has been patched to an address
|
|
that the debugging user wants us to stop on. When patching mallwatch,
|
|
don't forget to set a breakpoint on tr_break! */
|
|
|
|
void
|
|
mtrace ()
|
|
{
|
|
#ifdef _LIBC
|
|
static int added_atexit_handler = 0;
|
|
#endif
|
|
char *mallfile;
|
|
|
|
/* Don't panic if we're called more than once. */
|
|
if (mallstream != NULL)
|
|
return;
|
|
|
|
#ifdef _LIBC
|
|
/* When compiling the GNU libc we use the secure getenv function
|
|
which prevents the misuse in case of SUID or SGID enabled
|
|
programs. */
|
|
mallfile = __secure_getenv (mallenv);
|
|
#else
|
|
mallfile = getenv (mallenv);
|
|
#endif
|
|
if (mallfile != NULL || mallwatch != NULL)
|
|
{
|
|
mallstream = fopen (mallfile != NULL ? mallfile : "/dev/null", "w");
|
|
if (mallstream != NULL)
|
|
{
|
|
/* Be sure it doesn't malloc its buffer! */
|
|
setbuf (mallstream, mallbuf);
|
|
fprintf (mallstream, "= Start\n");
|
|
tr_old_free_hook = __free_hook;
|
|
__free_hook = tr_freehook;
|
|
tr_old_malloc_hook = __malloc_hook;
|
|
__malloc_hook = tr_mallochook;
|
|
tr_old_realloc_hook = __realloc_hook;
|
|
__realloc_hook = tr_reallochook;
|
|
#ifdef _LIBC
|
|
if (!added_atexit_handler)
|
|
{
|
|
added_atexit_handler = 1;
|
|
atexit (release_libc_mem);
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
muntrace ()
|
|
{
|
|
if (mallstream == NULL)
|
|
return;
|
|
|
|
fprintf (mallstream, "= End\n");
|
|
fclose (mallstream);
|
|
mallstream = NULL;
|
|
__free_hook = tr_old_free_hook;
|
|
__malloc_hook = tr_old_malloc_hook;
|
|
__realloc_hook = tr_old_realloc_hook;
|
|
}
|