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.
This commit is contained in:
Ulrich Drepper 2000-02-11 19:48:04 +00:00
parent cd090f718f
commit 586599b500
10 changed files with 179 additions and 29 deletions

View File

@ -1,3 +1,16 @@
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.
2000-02-01 Jakub Jelinek <jakub@redhat.com> 2000-02-01 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/getresgid.c: Move... * sysdeps/unix/sysv/linux/getresgid.c: Move...

View File

@ -27,7 +27,7 @@ dist-headers := malloc.h
headers := $(dist-headers) obstack.h mcheck.h headers := $(dist-headers) obstack.h mcheck.h
tests := mallocbug tst-malloc 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. # Things which get pasted together into gmalloc.c.
gmalloc-routines := malloc morecore gmalloc-routines := malloc morecore

View File

@ -28,6 +28,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include <memprof.h>
/* Pointer to the real functions. These are determined used `dlsym' /* Pointer to the real functions. These are determined used `dlsym'
when really needed. */ when really needed. */
static void *(*mallocp) (size_t); static void *(*mallocp) (size_t);
@ -74,34 +76,6 @@ static uintptr_t start_sp;
#define peak_stack peak_use[1] #define peak_stack peak_use[1]
#define peak_total peak_use[2] #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 #define DEFAULT_BUFFER_SIZE 1024
static size_t buffer_size; static size_t buffer_size;

21
sysdeps/alpha/memprof.h Normal file
View File

@ -0,0 +1,21 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#define GETSP() ({ register uintptr_t stack_ptr asm ("$30"); stack_ptr; })
#include <sysdeps/generic/memprof.h>

35
sysdeps/generic/memprof.h Normal file
View File

@ -0,0 +1,35 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#ifndef GETSP
# warning "GETSP is not defined for this architecture."
# define GETSP 0
#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

22
sysdeps/i386/memprof.h Normal file
View File

@ -0,0 +1,22 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#define GETSP() ({ register uintptr_t stack_ptr asm ("esp"); stack_ptr; })
#define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high))
#include <sysdeps/generic/memprof.h>

22
sysdeps/m68k/memprof.h Normal file
View File

@ -0,0 +1,22 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; })
#include <sysdeps/generic/memprof.h>

21
sysdeps/mips/memprof.h Normal file
View File

@ -0,0 +1,21 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#define GETSP() ({ register uintptr_t stack_ptr asm ("$29"); stack_ptr; })
#include <sysdeps/generic/memprof.h>

21
sysdeps/powerpc/memprof.h Normal file
View File

@ -0,0 +1,21 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#define GETSP() ({ register uintptr_t stack_ptr asm ("%r1"); stack_ptr; })
#include <sysdeps/generic/memprof.h>

21
sysdeps/sparc/memprof.h Normal file
View File

@ -0,0 +1,21 @@
/* Copyright (C) 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C 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.
The GNU C 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 the GNU C 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. */
#define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; })
#include <sysdeps/generic/memprof.h>