4a39c34c4f
Since gettimeofday will shortly be implemented in terms of clock_gettime on all platforms, internal code should use clock_gettime directly; in addition to removing a layer of indirection, this will allow us to remove the PLT-bypass gunk for gettimeofday. (We can't quite do that yet, but it'll be coming later in this patch series.) In many cases, the changed code does fewer conversions. The changed code always assumes __clock_gettime (CLOCK_REALTIME) cannot fail. Most of the call sites were assuming gettimeofday could not fail, but a few places were checking for errors. POSIX says clock_gettime can only fail if the clock constant is invalid or unsupported, and CLOCK_REALTIME is the one and only clock constant that's required to be supported. For consistency I grepped the entire source tree for any other places that checked for errors from __clock_gettime (CLOCK_REALTIME), found one, and changed it too. (For the record, POSIX also says gettimeofday can never fail.) (It would be nice if we could declare that GNU systems will always support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several places where we are using CLOCK_REALTIME where _MONOTONIC would be more appropriate, and/or trying to use _MONOTONIC and then falling back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet, and it looks like adding it would involve substantial changes to gnumach's internals and API. Oh well.) A few Hurd-specific files were changed to use __host_get_time instead of __clock_gettime, as this seemed tidier. We also assume this cannot fail. Skimming the code in gnumach leads me to believe the only way it could fail is if __mach_host_self also failed, and our Hurd-specific code consistently assumes that can't happen, so I'm going with that. With the exception of support/support_test_main.c, test cases are not modified, mainly because I didn't want to have to figure out which test cases were testing gettimeofday specifically. The definition of GETTIME in sysdeps/generic/memusage.h had a typo and was not reading tv_sec at all. I fixed this. It appears nobody has been generating malloc traces on a machine that doesn't have a superseding definition. There are a whole bunch of places where the code could be simplified by factoring out timespec subtraction and/or comparison logic, but I want to keep this patch as mechanical as possible. Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Reviewed-by: Lukasz Majewski <lukma@denx.de>
74 lines
2.4 KiB
C
74 lines
2.4 KiB
C
/* Return CPU and real time used by process and its children. Hurd version.
|
|
Copyright (C) 2001-2019 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, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#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;
|
|
|
|
__host_get_time (__mach_host_self (), &now);
|
|
|
|
return (clock_from_time_value (&now)
|
|
- clock_from_time_value (&bi.creation_time));
|
|
}
|
|
weak_alias (__times, times)
|