From patchwork Sun Jan 12 22:32:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 104637 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DF06C3858408 for ; Sun, 12 Jan 2025 22:38:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DF06C3858408 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 38A813858408 for ; Sun, 12 Jan 2025 22:32:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 38A813858408 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 38A813858408 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736721177; cv=none; b=kQ2JZTJEy1txF5gPsWuqOHcAThH4IVmXRMkRDzoWMaCPlDwU3QpAhV56JtRUlNNEhhWZRy6HqwgbgwGWfB8r7RUbt0rZbGuBqP01zXJodYkwUsM1PmO+z+QBvnN01JDDahisrn3qEnCqeGpV35gFoCubelaZmuH6XTDfBbw3D38= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736721177; c=relaxed/simple; bh=UhGFrnH/ENmwBQuCqU+rJyMvKzL94YPzPk5uYSrIwNM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=r6mspC5qZK1POAQoneQyka+pHjFmqI4cw06RWoeIbhKGtrvKvIMSVpGqShqKKGNz4oxbFl82q2FLMj/q+vMnKDTl5V0N3IJrqrtkRbjMKTnyNdy0pyXKXaWOuNxegL6oxqrtyKUIJM0/b/O+xXlmUdIxjcRi8meq8OScmjsEHYs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38A813858408 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 5B887A49CB; Sun, 12 Jan 2025 23:32:56 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z_AL-EECmGJn; Sun, 12 Jan 2025 23:32:56 +0100 (CET) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id E75F6A49CC; Sun, 12 Jan 2025 23:32:55 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tX6Vr-0000000Ch4D-1oaA; Sun, 12 Jan 2025 23:32:55 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Zhaoming Luo , commit-hurd@gnu.org Subject: [hurd, commited 1/4] mach: Add CLOCK_MONOTONIC case in clock_gettime() Date: Sun, 12 Jan 2025 23:32:51 +0100 Message-ID: <20250112223254.3025467-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250112223254.3025467-1-samuel.thibault@ens-lyon.org> References: <20250112223254.3025467-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: Zhaoming Luo The Mach RPC host_get_uptime64() is implemented. It returns the elapsed time value since bootup. See https://git.savannah.gnu.org/cgit/hurd/gnumach.git/commit/?id=fc494bfe3fb6363e1077dc035eb119970d84a9d1 In this patch, the RPC is used to implement the monotonic clock for mach. * config.h.in: Add HAVE_HOST_GET_UPTIME64 config entry * sysdeps/mach/clock_gettime.c: Add CLOCK_MONOTONIC case * sysdeps/mach/configure: Check the existence of host_get_uptime64 RPC * sysdeps/mach/configure.ac: Check the existence of host_get_uptime64 RPC Message-ID: <20250106043907.1046-1-zhmingluo@163.com> --- config.h.in | 3 +++ sysdeps/mach/clock_gettime.c | 24 ++++++++++++++++++++++++ sysdeps/mach/configure | 30 ++++++++++++++++++++++++++++++ sysdeps/mach/configure.ac | 2 ++ 4 files changed, 59 insertions(+) diff --git a/config.h.in b/config.h.in index c26f98ccd6..cdbd555366 100644 --- a/config.h.in +++ b/config.h.in @@ -163,6 +163,9 @@ /* Mach specific: define if the `host_page_size' RPC is available. */ #undef HAVE_HOST_PAGE_SIZE +/* Mach specific: define if the `host_get_uptime64' RPC is available. */ +#undef HAVE_HOST_GET_UPTIME64 + /* Mach specific: define if the `thread_set_name' RPC is available. */ #undef HAVE_MACH_THREAD_SET_NAME diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c index 1392475963..d8c6681ec5 100644 --- a/sysdeps/mach/clock_gettime.c +++ b/sysdeps/mach/clock_gettime.c @@ -20,6 +20,7 @@ #include #include #include +#include /* Get the current time of day, putting it into *TS. Returns 0 on success, -1 on errors. */ @@ -31,6 +32,29 @@ __clock_gettime (clockid_t clock_id, struct timespec *ts) switch (clock_id) { + case CLOCK_MONOTONIC: + /* If HAVE_HOST_GET_UPTIME64 is not defined or not available, + CLOCK_MONOTONIC will be equivalent to CLOCK_REALTIME. */ +#ifdef HAVE_HOST_GET_UPTIME64 + { + time_value64_t tv; + err = __host_get_uptime64 (__mach_host_self (), &tv); + + if (err != MIG_BAD_ID) + { + if (err) + { + __set_errno (err); + return -1; + } + + TIME_VALUE64_TO_TIMESPEC (&tv, ts); + return 0; + } + } + /* FALLTHROUGH */ +#endif + case CLOCK_REALTIME: { /* __host_get_time can only fail if passed an invalid host_t. diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index abfe084fda..8aa6bbb18b 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -461,6 +461,36 @@ if test $libc_cv_mach_rpc_host_page_size = yes; then fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for host_get_uptime64 in mach_host.defs" >&5 +printf %s "checking for host_get_uptime64 in mach_host.defs... " >&6; } +if test ${libc_cv_mach_rpc_host_get_uptime64+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP_TRADITIONAL "host_get_uptime64" >/dev/null 2>&1 +then : + libc_cv_mach_rpc_host_get_uptime64=yes +else case e in #( + e) libc_cv_mach_rpc_host_get_uptime64=no ;; +esac +fi +rm -rf conftest* + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mach_rpc_host_get_uptime64" >&5 +printf "%s\n" "$libc_cv_mach_rpc_host_get_uptime64" >&6; } +if test $libc_cv_mach_rpc_host_get_uptime64 = yes; then + printf "%s\n" "#define HAVE_HOST_GET_UPTIME64 1" >>confdefs.h + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thread_set_name in gnumach.defs" >&5 printf %s "checking for thread_set_name in gnumach.defs... " >&6; } if test ${libc_cv_mach_rpc_thread_set_name+y} diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac index 6dfa2b3518..08e5fdefe9 100644 --- a/sysdeps/mach/configure.ac +++ b/sysdeps/mach/configure.ac @@ -92,6 +92,8 @@ fi mach_RPC_CHECK(mach_host.defs, host_page_size, HAVE_HOST_PAGE_SIZE) +mach_RPC_CHECK(mach_host.defs, host_get_uptime64, + HAVE_HOST_GET_UPTIME64) mach_RPC_CHECK(gnumach.defs, thread_set_name, HAVE_MACH_THREAD_SET_NAME) mach_RPC_CHECK(gnumach.defs, thread_get_name,