aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-03 08:51:46 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-03 08:51:46 +0000
commit1418bf990e16ae15a4f3b7a8b38ac57a79e7f4dd (patch)
tree2d20dfbcc2ebd0061d714b23601b74d6a397dcde
parent56421b23d7d20f0278ddbe2091cc05a320748e58 (diff)
downloadglibc-1418bf990e16ae15a4f3b7a8b38ac57a79e7f4dd.tar
glibc-1418bf990e16ae15a4f3b7a8b38ac57a79e7f4dd.tar.gz
glibc-1418bf990e16ae15a4f3b7a8b38ac57a79e7f4dd.tar.bz2
glibc-1418bf990e16ae15a4f3b7a8b38ac57a79e7f4dd.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--nptl/Banner2
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h6
-rw-r--r--sysdeps/unix/sysv/linux/prof-freq.c51
4 files changed, 64 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dca87c988b..387106c543 100644
--- 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 00dde3737e..80e09ac5a5 100644
--- 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 2d6953350b..256e77b882 100644
--- 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
index 0000000000..00e963556c
--- /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)