This is needed to run Python on the Hurd, especially during the build of python-boot0. Adapted from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff commit d57f2f9b4bd007846af2fb4217486ea572579010 Author: Richard Braun Date: Tue Aug 27 11:35:31 2013 +0200 Express CPU time (clock_t of times(2)) in centiseconds From 170c292b643fdc1eb56881e6592b07c0c019993e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 2 Mar 2020 18:28:54 +0100 Subject: [PATCH 1/2] Express CPU time (clock_t) in centiseconds --- sysdeps/mach/hurd/clock.c | 8 ++++---- sysdeps/mach/hurd/getclktck.c | 5 ++--- sysdeps/mach/hurd/setitimer.c | 2 +- sysdeps/mach/hurd/times.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sysdeps/mach/hurd/clock.c b/sysdeps/mach/hurd/clock.c index 7cb42df786..4db49b579d 100644 --- a/sysdeps/mach/hurd/clock.c +++ b/sysdeps/mach/hurd/clock.c @@ -44,10 +44,10 @@ clock (void) 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; + total = bi.user_time.seconds * 100 + bi.user_time.microseconds / 10000; + total += tti.user_time.seconds * 100 + tti.user_time.microseconds / 10000; + total += bi.system_time.seconds * 100 + bi.system_time.microseconds / 10000; + total += tti.system_time.seconds * 100 + tti.system_time.microseconds / 10000; return total; } diff --git a/sysdeps/mach/hurd/getclktck.c b/sysdeps/mach/hurd/getclktck.c index 943e36e805..5a3cf0930b 100644 --- a/sysdeps/mach/hurd/getclktck.c +++ b/sysdeps/mach/hurd/getclktck.c @@ -18,12 +18,11 @@ #include -/* Return frequency of `times'. - Since Mach reports CPU times in microseconds, we always use 1 million. */ +/* Return frequency of `times'. */ int __getclktck (void) { - return 1000000; + return 100; } /* Before glibc 2.2, the Hurd actually did this differently, so we diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index b16f4ddd5d..8bf1464830 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -43,7 +43,7 @@ quantize_timev2019-09-16services: certbot: Add --manual-public-ip-logging-ok for manual challengesCarlo Zancanaro * gnu/services/certbot.scm (certbot-command): Add --manual-public-ip-logging-ok flag to the certbot command when doing a manual challenge. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2019-09-11