mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
a2b08ee541
1997-09-27 01:14 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (extra-objs): Depend in before-compile. * configure.in: Locate Perl and substitute with complete path. * config.make.in: Add PERL for substitution. * elf/Makefile (routines): Add dl-addr. * elf/dladdr.c: Move the real code into ... * elf/dl-addr.c: New file. * elf/link.h: Add prototype for _dl_addr. * elf/dladdr.c (dladdr): Change address argument to be const. * elf/dlfcn.h: Likewise. * locale/C_name.c: Add _nl_POSIX_name. * locale/localeinfo.h: Add declaration of _nl_POSIX_name. * locale/findlocale.c (_nl_find_locale): Use _nl_POSIX_name. (_nl_remove_locale): Free name of data set. * locale/setlocale.c (clever_copy): Remove. (new_composite_name): Use _nl_C_name and _nl_POSIX_name in compare. (setname): Only remove old name when it is for category LC_ALL. Change malloc, free, realloc, and memalign hooks for glibc to take another parameter indicating the location of the caller. * malloc/malloc.c: Change hook functions and variables. * malloc/malloc.h: Likewise. * malloc/mcheck.c: Likewise. Make sure later hooked function also get the original caller address. * malloc/mtrace.c: Likewise. (tr_where): If no information in _mtrace_file is given use the information about the caller. * malloc/Makefile (distribute): Replace mtrace.awk by mtrace.pl. Add rules to install mtrace.pl after rewriting. * malloc/mtrace.pl: New file. Based on the old AWK script but with extended functionality. * malloc/mtrace.awk: Removed. * po/fr.po: New version. * string/Makefile: Do use builtins for tester.c and inl-tester.c. * string/tester.c: Rewrite. Split in many small functions to not exceed gcc's limits. * sysdeps/unix/sysv/linux/syscalls.list: Add prctl. 1997-09-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/bits/string2.h (__stpcpy_small): Don't use casts as lvalues. 1997-09-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/time.texi (Formatting Date and Time): Clarify explanation of strftime flags a bit. Suggested by Robert Bihlmeyer <robbe@orcus.priv.at>. 1997-09-25 00:13 David S. Miller <davem@tanya.rutgers.edu> * sysdeps/libm-ieee754/s_exp2f.c: Protect _GNU_SOURCE definition. Fix typo, it is FLT_MANT_DIG. 1997-09-24 18:52 H.J. Lu <hjl@gnu.ai.mit.edu> * math/atest-exp2.c: Include <stdlib/gmp.h> instead of <gmp.h>. 1997-08-27 08:10 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/libio.h, libio/libioP.h: Support libio in libstdc++. * libio/libio.h (_IO_peekc): Defined as _IO_peekc_unlocked if _IO_MTSAFE_IO is undefined. 1997-09-24 23:27 Richard Henderson <rth@cygnus.com> * elf/dl-runtime.c (fixup): Don't go through elf_machine_relplt, but lookup the value of the target symbol ourselves and call the new elf_machine_fixup_plt. This kills the ELF_FIXUP_RETURN_VALUE hack. (profile_fixup): Likewise, but don't fix up the plt. * elf/rtld.c (_dl_main): ELF_MACHINE_RELOC_NOPLT renamed _JMP_SLOT. * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RELOC_NOPLT): Renamed. (elf_alpha_fix_plt): Renamed elf_machine_fixup_plt. * sysdeps/i386/dl-machine.h (elf_machine_relplt): Killed. (ELF_MACHINE_JMP_SLOT): Renamed. (elf_machine_fixup_plt): New function. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. (elf_machine_rela): Moved JMP_SLOT fixup out to elf_machine_fixup_plt. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/stub/dl-machine.h: Update, sorta. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Do profiling. (TRAMPOLINE_TEMPLATE): From the carcas of _RUNTIME_TRAMPOLINE, do both normal and profile code. (elf_machine_rela): Handle r_addend for .got and .plt too.
249 lines
6.4 KiB
C
249 lines
6.4 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 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));
|
|
static void
|
|
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;
|
|
}
|
|
|
|
/* 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 ()
|
|
{
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|