Update.

2003-07-03  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_AT_CLKTCK):
	Define.
	* sysdeps/unix/sysv/linux/prof-freq.h: New file.

diff --git a/ChangeLog b/ChangeLog
index dca87c988bc2ec4d03477be66a0f9a3c3c5df429..387106c54316b28212b502b009ce56043b6cafb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-03  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_AT_CLKTCK):
+       Define.
+       * sysdeps/unix/sysv/linux/prof-freq.h: New file.
+
 2003-07-02  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Protect new_sysinfo

diff --git a/nptl/Banner b/nptl/Banner
index 00dde3737e40b7f34847a2907ef218072c39c56a..80e09ac5a5bbbed59c99e542c3fab853271a704e 100644 (file)
--- a/nptl/Banner
+++ b/nptl/Banner
@@ -1 +1 @@
-NPTL 0.51 by Ulrich Drepper
+NPTL 0.52 by Ulrich Drepper

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 2d6953350b95b60faf0b5139c66b39083240481b..256e77b8826d8132480384e6b6cea884916b98f1 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -175,6 +175,12 @@
 # define __ASSUME_FCNTL64              1
 #endif
 
+/* The AT_CLKTCK auxiliary vector entry was introduction in the 2.4.0
+   series.  */
+#if __LINUX_KERNEL_VERSION >= 132097
+# define __ASSUME_AT_CLKTCK            1
+#endif
+
 /* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I
    don't know when it got introduced).  But PowerPC64 does not support
    separate FCNTL64 call, FCNTL is already 64-bit */

diff --git a/sysdeps/unix/sysv/linux/prof-freq.c b/sysdeps/unix/sysv/linux/prof-freq.c
new file mode 100644 (file)
index 0000000..00e9635
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/prof-freq.c
@@ -0,0 +1,51 @@
+/* Determine realtime clock frequency.
+   Copyright (C) 2003 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sys/time.h>
+#include <libc-internal.h>
+#include "kernel-features.h"
+#include <ldsodefs.h>
+
+
+int
+__profile_frequency (void)
+{
+#ifdef __ASSUME_AT_CLKTCK
+  return GL(dl_clktck);
+#else
+  if (GL(dl_clktck) != )
+    return GL(dl_clktck);
+
+  struct itimerval tim;
+
+  tim.it_interval.tv_sec = 0;
+  tim.it_interval.tv_usec = 1;
+  tim.it_value.tv_sec = 0;
+  tim.it_value.tv_usec = 0;
+
+  __setitimer (ITIMER_REAL, &tim, 0);
+  __setitimer (ITIMER_REAL, 0, &tim);
+
+  if (tim.it_interval.tv_usec < 2)
+    return 0;
+
+  return 1000000 / tim.it_interval.tv_usec;
+#endif
+}
+libc_hidden_def (__profile_frequency)