mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Update.
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.
This commit is contained in:
Ulrich Drepper
@@ -1,5 +1,5 @@
|
||||
/* More debugging hooks for `malloc'.
|
||||
Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
|
||||
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.
|
||||
|
||||
@@ -28,6 +28,10 @@
|
||||
#include <bits/libc-lock.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ELF
|
||||
#include <link.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifndef __GNU_LIBRARY__
|
||||
@@ -51,9 +55,12 @@ char *_mtrace_file;
|
||||
int _mtrace_line;
|
||||
|
||||
/* Old hook values. */
|
||||
static void (*tr_old_free_hook) __P ((__ptr_t ptr));
|
||||
static __ptr_t (*tr_old_malloc_hook) __P ((__malloc_size_t size));
|
||||
static __ptr_t (*tr_old_realloc_hook) __P ((__ptr_t ptr, __malloc_size_t size));
|
||||
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,
|
||||
@@ -66,51 +73,77 @@ tr_break ()
|
||||
{
|
||||
}
|
||||
|
||||
static void tr_where __P ((void));
|
||||
static void tr_where __P ((const __ptr_t));
|
||||
static void
|
||||
tr_where ()
|
||||
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));
|
||||
static void tr_freehook __P ((__ptr_t, const __ptr_t));
|
||||
static void
|
||||
tr_freehook (ptr)
|
||||
tr_freehook (ptr, caller)
|
||||
__ptr_t ptr;
|
||||
const __ptr_t caller;
|
||||
{
|
||||
tr_where ();
|
||||
fprintf (mallstream, "- %p\n", ptr); /* Be sure to print it first. */
|
||||
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;
|
||||
free (ptr);
|
||||
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));
|
||||
static __ptr_t tr_mallochook __P ((__malloc_size_t, const __ptr_t));
|
||||
static __ptr_t
|
||||
tr_mallochook (size)
|
||||
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;
|
||||
hdr = (__ptr_t) malloc (size);
|
||||
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 ();
|
||||
tr_where (caller);
|
||||
/* We could be printing a NULL here; that's OK. */
|
||||
fprintf (mallstream, "+ %p %lx\n", hdr, (unsigned long)size);
|
||||
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long)size);
|
||||
|
||||
if (hdr == mallwatch)
|
||||
tr_break ();
|
||||
@@ -118,11 +151,12 @@ tr_mallochook (size)
|
||||
return hdr;
|
||||
}
|
||||
|
||||
static __ptr_t tr_reallochook __P ((__ptr_t, __malloc_size_t));
|
||||
static __ptr_t tr_reallochook __P ((__ptr_t, __malloc_size_t, const __ptr_t));
|
||||
static __ptr_t
|
||||
tr_reallochook (ptr, size)
|
||||
tr_reallochook (ptr, size, caller)
|
||||
__ptr_t ptr;
|
||||
__malloc_size_t size;
|
||||
const __ptr_t caller;
|
||||
{
|
||||
__ptr_t hdr;
|
||||
|
||||
@@ -134,21 +168,24 @@ tr_reallochook (ptr, size)
|
||||
__free_hook = tr_old_free_hook;
|
||||
__malloc_hook = tr_old_malloc_hook;
|
||||
__realloc_hook = tr_old_realloc_hook;
|
||||
hdr = (__ptr_t) realloc (ptr, size);
|
||||
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 ();
|
||||
tr_where (caller);
|
||||
if (hdr == NULL)
|
||||
/* Failed realloc. */
|
||||
fprintf (mallstream, "! %p %lx\n", ptr, (unsigned long)size);
|
||||
fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long)size);
|
||||
else if (ptr == NULL)
|
||||
fprintf (mallstream, "+ %p %lx\n", hdr, (unsigned long)size);
|
||||
fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long)size);
|
||||
else
|
||||
fprintf (mallstream, "< %p\n> %p %lx\n", ptr, hdr, (unsigned long)size);
|
||||
fprintf (mallstream, "< %p\n> %p %#lx\n", ptr, hdr, (unsigned long)size);
|
||||
|
||||
if (hdr == mallwatch)
|
||||
tr_break ();
|
||||
|
||||
Reference in New Issue
Block a user