diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-09-20 19:19:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-09-20 19:19:08 +0000 |
| commit | 0e21f7767e2746d212cfc0ae117db2d035beed18 (patch) | |
| tree | 33f974f0e87a74c3f41cc64f6ecda858be224759 | |
| parent | f4cc201ee1f54231e3e9e3c6268e29f1ed14994b (diff) | |
| download | glibc-0e21f7767e2746d212cfc0ae117db2d035beed18.tar.gz glibc-0e21f7767e2746d212cfc0ae117db2d035beed18.tar.xz glibc-0e21f7767e2746d212cfc0ae117db2d035beed18.zip | |
Update.
* malloc/memusage.c (me): Always use dlsym() to find the real implementations.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | malloc/memusage.c | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 5aa60ecf67..0e1dcfe9b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-09-20 Ulrich Drepper <drepper@redhat.com> + * 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 <aj@suse.de> diff --git a/malloc/memusage.c b/malloc/memusage.c index d619fb96fb..19bb35f94f 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)) |