aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-08-13 02:05:11 +0000
committerRoland McGrath <roland@gnu.org>2001-08-13 02:05:11 +0000
commit414763270338fd3d691db201a74869016b6ae51c (patch)
tree062696ae1db1956ac8c8d0bb19688ff097c52c1e /sysdeps
parent2c6497200622cb3f9551f0c8120c2d3535f2a25d (diff)
downloadglibc-414763270338fd3d691db201a74869016b6ae51c.tar
glibc-414763270338fd3d691db201a74869016b6ae51c.tar.gz
glibc-414763270338fd3d691db201a74869016b6ae51c.tar.bz2
glibc-414763270338fd3d691db201a74869016b6ae51c.zip
* sysdeps/mach/hurd/clock.c: New file.
* sysdeps/mach/hurd/times.c: New file. * sysdeps/mach/hurd/getclktck.c (__getclktck): Always return 1000000. * sysdeps/mach/hurd/init-posix.c: New file.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/mach/hurd/clock.c54
-rw-r--r--sysdeps/mach/hurd/getclktck.c26
-rw-r--r--sysdeps/mach/hurd/init-posix.c2
-rw-r--r--sysdeps/mach/hurd/times.c76
4 files changed, 136 insertions, 22 deletions
diff --git a/sysdeps/mach/hurd/clock.c b/sysdeps/mach/hurd/clock.c
new file mode 100644
index 0000000000..d6d4597bc3
--- /dev/null
+++ b/sysdeps/mach/hurd/clock.c
@@ -0,0 +1,54 @@
+/* Return the CPU time used by the program so far. Hurd version.
+ Copyright (C) 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
+ 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 <time.h>
+#include <sys/time.h>
+#include <mach.h>
+#include <mach/task_info.h>
+#include <hurd.h>
+
+/* Return the time used by the program so far (user time + system time). */
+clock_t
+clock (void)
+{
+ struct task_basic_info bi;
+ struct task_thread_times_info tti;
+ mach_msg_type_number_t count;
+ clock_t total;
+ error_t err;
+
+ count = TASK_BASIC_INFO_COUNT;
+ err = __task_info (__mach_task_self (), TASK_BASIC_INFO,
+ (task_info_t) &bi, &count);
+ if (err)
+ return __hurd_fail (err);
+
+ count = TASK_THREAD_TIMES_INFO_COUNT;
+ err = __task_info (__mach_task_self (), TASK_THREAD_TIMES_INFO,
+ (task_info_t) &tti, &count);
+ if (err)
+ return __hurd_fail (err);
+
+ total = bi.user_time.seconds * 1000000 + bi.user_time.microseconds;
+ total += tti.user_time.seconds * 1000000 + tti.user_time.microseconds;
+ total += bi.system_time.seconds * 1000000 + bi.system_time.microseconds;
+ total += tti.system_time.seconds * 1000000 + tti.system_time.microseconds;
+
+ return total;
+}
diff --git a/sysdeps/mach/hurd/getclktck.c b/sysdeps/mach/hurd/getclktck.c
index 268c0fccff..9cb46bbcaf 100644
--- a/sysdeps/mach/hurd/getclktck.c
+++ b/sysdeps/mach/hurd/getclktck.c
@@ -1,5 +1,5 @@
/* Return run-time value of CLK_TCK for Hurd.
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 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
@@ -17,32 +17,14 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <errno.h>
#include <time.h>
-#include <unistd.h>
-#include <mach.h>
-#include <mach/host_info.h>
-
-#ifndef SYSTEM_CLK_TCK
-# define SYSTEM_CLK_TCK 100
-#endif
-
-/* Return frequency of times(). */
+/* Return frequency of `times'.
+ Since Mach reports CPU times in microseconds, we always use 1 million. */
int
__getclktck ()
{
- struct host_sched_info hsi;
- mach_msg_type_number_t count;
- error_t err;
-
- count = HOST_SCHED_INFO_COUNT;
- err = __host_info (__mach_task_self (), HOST_SCHED_INFO,
- (host_info_t) &hsi, &count);
- if (err)
- return SYSTEM_CLK_TCK;
-
- return hsi.min_quantum;
+ return 1000000;
}
/* Before glibc 2.2, the Hurd actually did this differently, so we
diff --git a/sysdeps/mach/hurd/init-posix.c b/sysdeps/mach/hurd/init-posix.c
new file mode 100644
index 0000000000..3eecf62769
--- /dev/null
+++ b/sysdeps/mach/hurd/init-posix.c
@@ -0,0 +1,2 @@
+/* We don't need the unix/bsd version. */
+#include <sysdeps/generic/init-posix.c>
diff --git a/sysdeps/mach/hurd/times.c b/sysdeps/mach/hurd/times.c
new file mode 100644
index 0000000000..044ca17bae
--- /dev/null
+++ b/sysdeps/mach/hurd/times.c
@@ -0,0 +1,76 @@
+/* Return CPU and real time used by process and its children. Hurd version.
+ Copyright (C) 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
+ 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 <errno.h>
+#include <stddef.h>
+#include <sys/resource.h>
+#include <sys/times.h>
+#include <sys/time.h>
+#include <time.h>
+#include <mach.h>
+#include <mach/task_info.h>
+#include <hurd.h>
+
+static inline clock_t
+clock_from_time_value (const time_value_t *t)
+{
+ return t->seconds * 1000000 + t->microseconds;
+}
+
+/* Store the CPU time used by this process and all its
+ dead children (and their dead children) in BUFFER.
+ Return the elapsed real time, or (clock_t) -1 for errors.
+ All times are in CLK_TCKths of a second. */
+clock_t
+__times (struct tms *tms)
+{
+ struct task_basic_info bi;
+ struct task_thread_times_info tti;
+ mach_msg_type_number_t count;
+ time_value_t now;
+ error_t err;
+
+ count = TASK_BASIC_INFO_COUNT;
+ err = __task_info (__mach_task_self (), TASK_BASIC_INFO,
+ (task_info_t) &bi, &count);
+ if (err)
+ return __hurd_fail (err);
+
+ count = TASK_THREAD_TIMES_INFO_COUNT;
+ err = __task_info (__mach_task_self (), TASK_THREAD_TIMES_INFO,
+ (task_info_t) &tti, &count);
+ if (err)
+ return __hurd_fail (err);
+
+ tms->tms_utime = (clock_from_time_value (&bi.user_time)
+ + clock_from_time_value (&tti.user_time));
+ tms->tms_stime = (clock_from_time_value (&bi.system_time)
+ + clock_from_time_value (&tti.system_time));
+
+ /* XXX This can't be implemented until getrusage(RUSAGE_CHILDREN) can be. */
+ tms->tms_cutime = tms->tms_cstime = 0;
+
+ err = __host_get_time (__mach_host_self (), &now);
+ if (err)
+ return __hurd_fail (err);
+
+ return (clock_from_time_value (&now)
+ - clock_from_time_value (&bi.creation_time));
+}
+weak_alias (__times, times)