diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-02-11 19:48:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-02-11 19:48:04 +0000 |
| commit | 586599b5005e6dbe608dd6885b0b282472494405 (patch) | |
| tree | 6ca662e8a1f836ddf0cf7640b1f199d72a7a7aef /malloc | |
| parent | cd090f718fe308b9d19779abec98cfc0248f92fc (diff) | |
| download | glibc-586599b5005e6dbe608dd6885b0b282472494405.zip glibc-586599b5005e6dbe608dd6885b0b282472494405.tar.gz glibc-586599b5005e6dbe608dd6885b0b282472494405.tar.bz2 | |
Update.
2000-02-02 Andreas Schwab <schwab@suse.de>
* malloc/Makefile (distribute): Add memprof.h.
* malloc/memprof.c: Move definition of GETSP and GETTIME to new
header memprof.h.
* sysdeps/generic/memprof.h: New file.
* sysdeps/alpha/memprof.h: New file.
* sysdeps/i386/memprof.h: New file.
* sysdeps/m68k/memprof.h: New file.
* sysdeps/mips/memprof.h: New file.
* sysdeps/powerpc/memprof.h: New file.
* sysdeps/sparc/memprof.h: New file.
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/Makefile | 2 | ||||
| -rw-r--r-- | malloc/memprof.c | 30 |
2 files changed, 3 insertions, 29 deletions
diff --git a/malloc/Makefile b/malloc/Makefile index 90c7fc4..b06cf41 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -27,7 +27,7 @@ dist-headers := malloc.h headers := $(dist-headers) obstack.h mcheck.h tests := mallocbug tst-malloc -distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h +distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memprof.h # Things which get pasted together into gmalloc.c. gmalloc-routines := malloc morecore diff --git a/malloc/memprof.c b/malloc/memprof.c index c91b7cc..56d3ac5 100644 --- a/malloc/memprof.c +++ b/malloc/memprof.c @@ -28,6 +28,8 @@ #include <unistd.h> #include <sys/time.h> +#include <memprof.h> + /* Pointer to the real functions. These are determined used `dlsym' when really needed. */ static void *(*mallocp) (size_t); @@ -74,34 +76,6 @@ static uintptr_t start_sp; #define peak_stack peak_use[1] #define peak_total peak_use[2] -#ifdef __i386__ -# define GETSP() ({ register uintptr_t stack_ptr asm ("esp"); stack_ptr; }) -#endif -#ifdef __alpha__ -# define GETSP() ({ register uintptr_t stack_ptr asm ("$30"); stack_ptr; }) -#endif -#ifdef __sparc__ -# define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; }) -#endif -#ifdef __powerpc__ -# define GETSP() ({ register uintptr_t stack_ptr asm ("%r1"); stack_ptr; }) -#endif - -#ifdef __i386__ -# define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high)) -#endif -#ifndef GETTIME -# define GETTIME(low,high) \ - { \ - struct timeval tval; \ - uint64_t usecs; \ - gettimeofday (&tval, NULL); \ - usecs = (uint64_t) tval.tv_usec + (uint64_t) tval.tv_usec * 1000000; \ - low = usecs & 0xffffffff; \ - high = usecs >> 32; \ - } -#endif - #define DEFAULT_BUFFER_SIZE 1024 static size_t buffer_size; |