Update.

2001-03-21  Ulrich Drepper  <drepper@redhat.com>

	* gmon/Makefile (routines): Add sprofil.
	(tests): Add tst-sprofil.
	(noprof): Add sprofil.
	* gmon/Versions [libc] (GLIBC_2.2.3): Add sprofil.

2001-03-20  David Mosberger  <davidm@hpl.hp.com>

	* sysdeps/generic/sprofil.c: New file.
	* sysdeps/posix/sprofil.c: New file.
	* gmon/tst-sprofil.c: New file.
	* gmon/sys/profil.h: New file.

4 files changed, 243 insertions, 3 deletions

diff --git a/gmon/Makefile b/gmon/Makefile
index a07fe731eb..48f367fce9 100644
--- a/gmon/Makefile
+++ b/gmon/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2001 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
@@ -23,7 +23,9 @@ subdir	:= gmon
 
 headers	:= sys/gmon.h sys/gmon_out.h
 distribute := machine-gmon.h profil-counter.h
-routines := gmon mcount profil bb_init_func bb_exit_func prof-freq
+routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq
+
+tests	:= tst-sprofil
 
 include ../Rules
 
@@ -37,7 +39,7 @@ CFLAGS-mcount.c := -fno-omit-frame-pointer
 
 noprof := mcount
 ifeq (,$(filter profil,$(unix-syscalls)))
-noprof += profil
+noprof += profil sprofil
 endif
 
 $(noprof:%=$(objpfx)%.op): %.op: %.o
diff --git a/gmon/Versions b/gmon/Versions
index c39f1d1f74..d0b63334f2 100644
--- a/gmon/Versions
+++ b/gmon/Versions
@@ -16,4 +16,7 @@ libc {
     # m*
     moncontrol;
   }
+  GLIBC_2.2.3 {
+    sprofil;
+  }
 }
diff --git a/gmon/sys/profil.h b/gmon/sys/profil.h
new file mode 100644
index 0000000000..136bd53511
--- /dev/null
+++ b/gmon/sys/profil.h
@@ -0,0 +1,63 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
+
+   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 _PROFIL_H
+#define _PROFIL_H	1
+
+#include <features.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+
+/* This interface is intended to follow the sprofil() system calls as
+   described by the sprofil(2) man page of Irix v6.5, except that:
+
+	- there is no a priori limit on number of text sections
+	- pr_scale is declared as unsigned long (instead of "unsigned int")
+	- pr_size is declared as size_t (instead of "unsigned int")
+	- pr_off is declared as void * (instead of "__psunsigned_t")
+	- the overflow bin (pr_base==0, pr_scale==2) can appear anywhere
+	  in the profp array
+	- PROF_FAST has no effect  */
+
+struct prof
+  {
+    void *pr_base;		/* buffer base */
+    size_t pr_size;		/* buffer size */
+    size_t pr_off;		/* pc offset */
+    unsigned long int pr_scale;	/* pc scaling (fixed-point number) */
+  };
+
+enum
+  {
+    PROF_USHORT	= 0,		/* use 16-bit counters (default) */
+    PROF_UINT	= 1 << 0,	/* use 32-bit counters */
+    PROF_FAST   = 1 << 1	/* profile faster than usual */
+  };
+
+
+__BEGIN_DECLS
+
+extern int sprofil (struct prof *__profp, int __profcnt,
+		    struct timeval *__tvp, unsigned int __flags) __THROW;
+
+__END_DECLS
+
+#endif /* profil.h */
diff --git a/gmon/tst-sprofil.c b/gmon/tst-sprofil.c
new file mode 100644
index 0000000000..26d4c7c56e
--- /dev/null
+++ b/gmon/tst-sprofil.c
@@ -0,0 +1,172 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
+
+   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.  */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/profil.h>
+
+#include <bits/wordsize.h>
+
+#define NELEMS(a)	(sizeof (a)/sizeof ((a)[0]))
+
+size_t taddr[] =
+  {
+    0x00001000,		/* elf32/hppa */
+    0x08048000,		/* Linux elf32/x86 */
+    0x80000000,		/* Linux elf32/m68k */
+    0x00400000,		/* Linux elf32/mips */
+    0x01800000,		/* Linux elf32/ppc */
+    0x00010000		/* Linux elf32/sparc */
+#if __WORDSIZE > 32
+    ,
+    0x4000000000000000,	/* Linux elf64/ia64 */
+    0x0000000120000000,	/* Linux elf64/alpha */
+    0x4000000000001000,	/* elf64/hppa */
+    0x0000000100000000	/* Linux elf64/sparc */
+#endif
+  };
+
+unsigned int buf[NELEMS (taddr)][0x10000 / sizeof (int)];
+unsigned int bshort[5][0x100 / sizeof (int)];
+unsigned int blong[1][0x1000 / sizeof (int)];
+unsigned int vlong[1][0x2000 / sizeof (int)];
+
+long int
+fac (long int n)
+{
+  if (n == 0)
+    return 1;
+  return n * fac (n - 1);
+}
+
+int
+main (int argc, char **argv)
+{
+  unsigned int ovfl = 0, profcnt = 0;
+  struct timeval tv, start;
+  struct prof prof[32];
+  double t_tick, delta;
+  long int sum = 0;
+  int i, j;
+
+  for (i = 0; i < NELEMS (taddr); ++i)
+    {
+      prof[profcnt].pr_base = buf[i];
+      prof[profcnt].pr_size = sizeof (buf[i]);
+      prof[profcnt].pr_off = taddr[i];
+      prof[profcnt].pr_scale = 0x10000;
+      ++profcnt;
+    }
+
+  prof[profcnt].pr_base = blong[0];
+  prof[profcnt].pr_size = sizeof (blong[0]);
+  prof[profcnt].pr_off = 0x80001000;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  prof[profcnt].pr_base = bshort[0];
+  prof[profcnt].pr_size = sizeof (bshort[0]);
+  prof[profcnt].pr_off = 0x80000080;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  prof[profcnt].pr_base = bshort[1];
+  prof[profcnt].pr_size = sizeof (bshort[1]);
+  prof[profcnt].pr_off = 0x80000f80;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  prof[profcnt].pr_base = bshort[2];
+  prof[profcnt].pr_size = sizeof (bshort[2]);
+  prof[profcnt].pr_off = 0x80001080;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  prof[profcnt].pr_base = bshort[3];
+  prof[profcnt].pr_size = sizeof (bshort[3]);
+  prof[profcnt].pr_off = 0x80001f80;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  prof[profcnt].pr_base = bshort[4];
+  prof[profcnt].pr_size = sizeof (bshort[4]);
+  prof[profcnt].pr_off = 0x80002080;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  prof[profcnt].pr_base = vlong[0];
+  prof[profcnt].pr_size = sizeof (vlong[0]);
+  prof[profcnt].pr_off = 0x80000080;
+  prof[profcnt].pr_scale = 0x10000;
+  ++profcnt;
+
+  /* Set up overflow counter (must be last on Irix).  */
+  prof[profcnt].pr_base = &ovfl;
+  prof[profcnt].pr_size = sizeof (ovfl);
+  prof[profcnt].pr_off = 0;
+  prof[profcnt].pr_scale = 2;
+  ++profcnt;
+
+  /* Turn it on.  */
+  if (sprofil (prof, profcnt, &tv, PROF_UINT) < 0)
+    {
+      if (errno == ENOSYS)
+	exit (0);
+      perror ("sprofil");
+      exit (1);
+    }
+
+  t_tick = tv.tv_sec + 1e-6 * tv.tv_usec;
+  printf ("profiling period = %g ms\n", 1e3 * t_tick);
+
+  gettimeofday (&start, NULL);
+  do
+    {
+      for (i = 0; i < 21; ++i)
+	sum += fac (i);
+
+      gettimeofday (&tv, NULL);
+      timersub (&tv, &start, &tv);
+      delta = tv.tv_sec + 1e-6 * tv.tv_usec;
+    }
+  while (delta < 1000 * t_tick);
+
+  printf ("sum = 0x%lx\n", sum);
+
+  /* Turn it off.  */
+  if (sprofil (NULL, 0, NULL, 0) < 0)
+    {
+      if (errno == ENOSYS)
+	exit (0);
+      perror ("sprofil");
+      exit (1);
+    }
+
+  printf ("overflow = %u\n", ovfl);
+  for (i = 0; i < NELEMS (taddr); ++i)
+    for (j = 0; j < 0x10000 / sizeof (int); ++j)
+      if (buf[i][j] != 0)
+	printf ("%0*Zx\t%u\t(buffer %d)\n",
+		(int) (sizeof (size_t) * 2),
+		(taddr[i] + (char *) &buf[i][j] - (char *) &buf[i][0]),
+		buf[i][j], i);
+
+  return 0;
+}