From 0e21f7767e2746d212cfc0ae117db2d035beed18 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 20 Sep 2001 19:19:08 +0000 Subject: [PATCH] Update. * malloc/memusage.c (me): Always use dlsym() to find the real implementations. --- ChangeLog | 3 +++ malloc/memusage.c | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5aa60ec..0e1dcfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-09-20 Ulrich Drepper + * malloc/memusage.c (me): Always use dlsym() to find the real + implementations. + * malloc/memusage.sh: Make -n option actually do something. 2001-09-20 Andreas Jaeger diff --git a/malloc/memusage.c b/malloc/memusage.c index d619fb9..19bb35f 100644 --- a/malloc/memusage.c +++ b/malloc/memusage.c @@ -181,6 +181,13 @@ me (void) const char *env = getenv ("MEMUSAGE_PROG_NAME"); size_t prog_len = strlen (__progname); + initialized = -1; + mallocp = (void *(*) (size_t)) dlsym (RTLD_NEXT, "malloc"); + reallocp = (void *(*) (void *, size_t)) dlsym (RTLD_NEXT, "realloc"); + callocp = (void *(*) (size_t, size_t)) dlsym (RTLD_NEXT, "calloc"); + freep = (void (*) (void *)) dlsym (RTLD_NEXT, "free"); + initialized = 1; + if (env != NULL) { /* Check for program name. */ @@ -198,13 +205,6 @@ me (void) if (!start_sp) start_sp = GETSP (); - initialized = -1; - mallocp = (void *(*) (size_t)) dlsym (RTLD_NEXT, "malloc"); - reallocp = (void *(*) (void *, size_t)) dlsym (RTLD_NEXT, "realloc"); - callocp = (void *(*) (size_t, size_t)) dlsym (RTLD_NEXT, "calloc"); - freep = (void (*) (void *)) dlsym (RTLD_NEXT, "free"); - initialized = 1; - outname = getenv ("MEMUSAGE_OUTPUT"); if (outname != NULL && outname[0] != '\0' && (access (outname, R_OK | W_OK) == 0 || errno == ENOENT)) -- 2.7.4