From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=KnRD=66=linaro.org=adhemerval.zanella@sourceware.org>
Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35])
	by sourceware.org (Postfix) with ESMTPS id 512F53858D39
	for <libc-alpha@sourceware.org>; Mon,  6 Mar 2023 16:03:28 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 512F53858D39
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org
Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-176d1a112bfso3038051fac.5
        for <libc-alpha@sourceware.org>; Mon, 06 Mar 2023 08:03:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=linaro.org; s=google; t=1678118607;
        h=content-transfer-encoding:mime-version:message-id:date:subject:to
         :from:from:to:cc:subject:date:message-id:reply-to;
        bh=gdk1XBDu9QEtYC9/RtOSOUf4FwnzsvWhmOfK4+nnxXo=;
        b=gUR+Plh13yIAU1/GB6Zci/HZw7Ytg97acnF30awd4HSuhRV34jbGyu4ziOemLktblw
         N2zc81C+9kWibBQyEVqsUC41cVkytqLYFIesk3mEoX/YtGg9c9CZNafBE5L67+xliJLe
         todSg38UeL2fJS3j5PKhuJ/jHX/jmYMccIAIYyiOqeZh1gR7a1rlzxjHktckDq0PMYaz
         /8MB77EUt7iEN3vGwpSGGp+x/8VvetlN2hMw9ie9n0x1rMQA4MFJkRKN/0H6gZ290CpD
         HmC3/lWhvKEqBNy3PYg9KIcQZ+1cm+Ed8SVAX7nURzjCbDQXfRBtO6kPYhofvDb+2e5q
         q4+w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112; t=1678118607;
        h=content-transfer-encoding:mime-version:message-id:date:subject:to
         :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
        bh=gdk1XBDu9QEtYC9/RtOSOUf4FwnzsvWhmOfK4+nnxXo=;
        b=I2ORxHeQsOpRFkLkOryGyMYseavO0Z0xIdFFHKC40poCI8LDmV0EBCpNRBfsIgeaXW
         5QeT1Op4sf0ZRXo4Ay5ze1S3eWxIU5Z5mDuDnbkFbk8NQm15Ax4UcIauARvlAd2KBYmI
         NBc8w+JMC7JxZQp3q2Ji0MAbvCO/3BydOsOF/Q075BRHhfmblEnKZQcokQ9x8MQ1U/R4
         YhPe2QxKb52jkZ4wcbajjKoREOf2JFJuaBmXUEUC534yLESI9StWmYVksQPZs8VQdQPO
         wqSkt1bR+rftjnY/WGOWzlOcWXWZVzX11PDojeflJRLwUjq9i5DS1UYm3NbC5B9yQM/S
         f6SA==
X-Gm-Message-State: AO0yUKUAxE2JyEagIzViHhnEEhF9jBetcD0U2eReRu4XFsO4l/z61LTQ
	Zqz99PON1MFwsFvyKLCDvBCmCK/eMI3i+CXCKVaERA==
X-Google-Smtp-Source: AK7set8xbpKl/udP3vqPko4GCaaP22lwGkQzYMkR3l2rBW7TlQgCIlmgZHQSDB9SfApleVjmRtOGIQ==
X-Received: by 2002:a05:6870:5709:b0:172:6d0c:e98c with SMTP id k9-20020a056870570900b001726d0ce98cmr5805171oap.29.1678118606760;
        Mon, 06 Mar 2023 08:03:26 -0800 (PST)
Received: from mandiga.. ([2804:1b3:a7c3:d849:8c2f:e58d:3e6:9de5])
        by smtp.gmail.com with ESMTPSA id m41-20020a4a952c000000b0051ff746e2b2sm4020986ooi.8.2023.03.06.08.03.24
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 06 Mar 2023 08:03:26 -0800 (PST)
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org,
	Bruno Haible <bruno@clisp.org>,
	Florian Weimer <fweimer@redhat.com>
Subject: [PATCH] time: Use CLOCK_REALTIME for time (BZ #30200)
Date: Mon,  6 Mar 2023 13:03:21 -0300
Message-Id: <20230306160321.2942372-1-adhemerval.zanella@linaro.org>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <libc-alpha.sourceware.org>

Different than gettimeofday and timespec_get, time uses
CLOCK_REALTIME_COARSE instead of CLOCK_REALTIME on Linux.  The
coarse time is used mostly as optimization, but it may show
divergence progression due the clock resolution.

For x86_64 and powerpc64, it should add slight more latency since
it would call now clock_gettime internally.

Checked on x86_64-linux-gnu.
---
 include/time.h                           |  5 ++-
 manual/time.texi                         |  4 +--
 sysdeps/generic/time-clockid.h           | 20 ------------
 sysdeps/mach/hurd/bits/errno.h           |  1 -
 sysdeps/unix/sysv/linux/dl-vdso-setup.c  |  3 --
 sysdeps/unix/sysv/linux/dl-vdso-setup.h  |  3 --
 sysdeps/unix/sysv/linux/i386/sysdep.h    |  1 -
 sysdeps/unix/sysv/linux/powerpc/sysdep.h |  1 -
 sysdeps/unix/sysv/linux/powerpc/time.c   | 22 -------------
 sysdeps/unix/sysv/linux/time-clockid.h   | 22 -------------
 sysdeps/unix/sysv/linux/time.c           | 41 +++---------------------
 sysdeps/unix/sysv/linux/x86/time.c       | 22 -------------
 sysdeps/unix/sysv/linux/x86_64/sysdep.h  |  1 -
 time/time.c                              |  3 +-
 14 files changed, 8 insertions(+), 141 deletions(-)
 delete mode 100644 sysdeps/generic/time-clockid.h
 delete mode 100644 sysdeps/unix/sysv/linux/powerpc/time.c
 delete mode 100644 sysdeps/unix/sysv/linux/time-clockid.h
 delete mode 100644 sysdeps/unix/sysv/linux/x86/time.c

diff --git a/include/time.h b/include/time.h
index f599eeed4e..2b27dc87cf 100644
--- a/include/time.h
+++ b/include/time.h
@@ -9,7 +9,6 @@
 # include <stdbool.h>
 # include <time/mktime-internal.h>
 # include <sys/time.h>
-# include <time-clockid.h>
 # include <sys/time.h>
 # include <stdint.h>
 
@@ -524,7 +523,7 @@ static inline time_t
 time_now (void)
 {
   struct timespec ts;
-  __clock_gettime (TIME_CLOCK_GETTIME_CLOCKID, &ts);
+  __clock_gettime (CLOCK_REALTIME, &ts);
   return ts.tv_sec;
 }
 
@@ -532,7 +531,7 @@ static inline __time64_t
 time64_now (void)
 {
   struct __timespec64 ts;
-  __clock_gettime64 (TIME_CLOCK_GETTIME_CLOCKID, &ts);
+  __clock_gettime64 (CLOCK_REALTIME, &ts);
   return ts.tv_sec;
 }
 
diff --git a/manual/time.texi b/manual/time.texi
index 0c7a942b4c..e42198522b 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -442,9 +442,7 @@ calendar time, with different levels of resolution.
 This is the simplest function for getting the current calendar time.
 It returns the calendar time as a value of type @code{time_t}; on
 POSIX systems, that means it has a resolution of one second.  It
-uses the same clock as @w{@samp{clock_gettime (CLOCK_REALTIME_COARSE)}},
-when the clock is available or @w{@samp{clock_gettime (CLOCK_REALTIME)}}
-otherwise.
+uses the same clock as @w{@samp{clock_gettime (CLOCK_REALTIME)}}.
 
 If the argument @var{result} is not a null pointer, the calendar time
 value is also stored in @code{*@var{result}}.
diff --git a/sysdeps/generic/time-clockid.h b/sysdeps/generic/time-clockid.h
deleted file mode 100644
index 21f1235a31..0000000000
--- a/sysdeps/generic/time-clockid.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* System specific time definitions.  Generic Version.
-   Copyright 2019-2023 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/>.  */
-
-/* Timer used on clock_gettime for time implementation.  */
-#define TIME_CLOCK_GETTIME_CLOCKID CLOCK_REALTIME
diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index 90c8897739..0d935e724a 100644
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -9,7 +9,6 @@
      mach/boolean.h
      mach/i386/boolean.h
      mach/i386/vm_types.h
-     mach/i386/stdint.h
      mach/mig_errors.h
      device/device_types.h
      mach/std_types.h
diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.c b/sysdeps/unix/sysv/linux/dl-vdso-setup.c
index 68fa8de641..895c24133e 100644
--- a/sysdeps/unix/sysv/linux/dl-vdso-setup.c
+++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.c
@@ -52,9 +52,6 @@ PROCINFO_CLASS int (*_dl_vdso_clock_gettime64) (clockid_t,
 # ifdef HAVE_GETTIMEOFDAY_VSYSCALL
 PROCINFO_CLASS int (*_dl_vdso_gettimeofday) (struct timeval *, void *) RELRO;
 #endif
-# ifdef HAVE_TIME_VSYSCALL
-PROCINFO_CLASS time_t (*_dl_vdso_time) (time_t *) RELRO;
-# endif
 # ifdef HAVE_GETCPU_VSYSCALL
 PROCINFO_CLASS int (*_dl_vdso_getcpu) (unsigned *, unsigned *, void *) RELRO;
 # endif
diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.h b/sysdeps/unix/sysv/linux/dl-vdso-setup.h
index 867072b897..1f29708e93 100644
--- a/sysdeps/unix/sysv/linux/dl-vdso-setup.h
+++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.h
@@ -32,9 +32,6 @@ setup_vdso_pointers (void)
 #ifdef HAVE_GETTIMEOFDAY_VSYSCALL
   GLRO(dl_vdso_gettimeofday) = dl_vdso_vsym (HAVE_GETTIMEOFDAY_VSYSCALL);
 #endif
-#ifdef HAVE_TIME_VSYSCALL
-  GLRO(dl_vdso_time) = dl_vdso_vsym (HAVE_TIME_VSYSCALL);
-#endif
 #ifdef HAVE_GETCPU_VSYSCALL
   GLRO(dl_vdso_getcpu) = dl_vdso_vsym (HAVE_GETCPU_VSYSCALL);
 #endif
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 8538cd5342..77c37a33d3 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -256,7 +256,6 @@ struct libc_do_syscall_args
 # define HAVE_CLOCK_GETTIME_VSYSCALL    "__vdso_clock_gettime"
 # define HAVE_CLOCK_GETTIME64_VSYSCALL  "__vdso_clock_gettime64"
 # define HAVE_GETTIMEOFDAY_VSYSCALL     "__vdso_gettimeofday"
-# define HAVE_TIME_VSYSCALL             "__vdso_time"
 # define HAVE_CLOCK_GETRES_VSYSCALL     "__vdso_clock_getres"
 
 # define HAVE_CLONE3_WRAPPER		1
diff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
index 96a0edc38f..59cda57639 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
@@ -220,7 +220,6 @@
 #define HAVE_CLOCK_GETTIME_VSYSCALL	"__kernel_clock_gettime"
 #endif
 #define HAVE_GETCPU_VSYSCALL		"__kernel_getcpu"
-#define HAVE_TIME_VSYSCALL		"__kernel_time"
 #define HAVE_GETTIMEOFDAY_VSYSCALL      "__kernel_gettimeofday"
 #define HAVE_GET_TBFREQ                 "__kernel_get_tbfreq"
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/time.c b/sysdeps/unix/sysv/linux/powerpc/time.c
deleted file mode 100644
index 0318a7a93d..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/time.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* time system call for Linux/PowerPC.
-   Copyright (C) 2013-2023 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/>.  */
-
-#ifdef __powerpc64__
-# define USE_IFUNC_TIME
-#endif
-#include <sysdeps/unix/sysv/linux/time.c>
diff --git a/sysdeps/unix/sysv/linux/time-clockid.h b/sysdeps/unix/sysv/linux/time-clockid.h
deleted file mode 100644
index b9ff418ecb..0000000000
--- a/sysdeps/unix/sysv/linux/time-clockid.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* System specific time definitions.  Generic Version.
-   Copyright 2019-2023 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/>.  */
-
-/* Timer used on clock_gettime for time implementation.  For Linux
-   it uses the coarse version which returns the time at the last tick
-   and mimic what time as syscall should return.  */
-#define TIME_CLOCK_GETTIME_CLOCKID CLOCK_REALTIME_COARSE
diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c
index a0e7fd7ac2..0480b5a782 100644
--- a/sysdeps/unix/sysv/linux/time.c
+++ b/sysdeps/unix/sysv/linux/time.c
@@ -16,40 +16,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-/* Optimize the function call by setting the PLT directly to vDSO symbol.  */
-#ifdef USE_IFUNC_TIME
-# include <time.h>
-# include <sysdep.h>
-# include <sysdep-vdso.h>
-
-#ifdef SHARED
-# include <dl-vdso.h>
-# include <libc-vdso.h>
-
-static time_t
-time_syscall (time_t *t)
-{
-  return INLINE_SYSCALL_CALL (time, t);
-}
-
-# undef INIT_ARCH
-# define INIT_ARCH() \
-  void *vdso_time = dl_vdso_vsym (HAVE_TIME_VSYSCALL);
-libc_ifunc (time,
-	    vdso_time ? VDSO_IFUNC_RET (vdso_time)
-		      : (void *) time_syscall);
-
-# else
-time_t
-time (time_t *t)
-{
-  return INLINE_VSYSCALL (time, 1, t);
-}
-# endif /* !SHARED */
-#else /* USE_IFUNC_TIME  */
-# include <time.h>
-# include <time-clockid.h>
-# include <errno.h>
+#include <time.h>
+#include <errno.h>
 
 /* Return the time now, and store it in *TIMER if not NULL.  */
 
@@ -57,7 +25,7 @@ __time64_t
 __time64 (__time64_t *timer)
 {
   struct __timespec64 ts;
-  __clock_gettime64 (TIME_CLOCK_GETTIME_CLOCKID, &ts);
+  __clock_gettime64 (CLOCK_REALTIME, &ts);
 
   if (timer != NULL)
     *timer = ts.tv_sec;
@@ -82,6 +50,5 @@ __time (time_t *timer)
     *timer = t;
   return t;
 }
-# endif
-weak_alias (__time, time)
 #endif
+weak_alias (__time, time)
diff --git a/sysdeps/unix/sysv/linux/x86/time.c b/sysdeps/unix/sysv/linux/x86/time.c
deleted file mode 100644
index aac2fbc4d1..0000000000
--- a/sysdeps/unix/sysv/linux/x86/time.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* time -- Get number of seconds since Epoch.  Linux/x86 version.
-   Copyright (C) 2015-2023 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/>.  */
-
-#ifdef __x86_64__
-# define USE_IFUNC_TIME
-#endif
-#include <sysdeps/unix/sysv/linux/time.c>
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index cfb51be8c5..6a8d610238 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -373,7 +373,6 @@
 /* List of system calls which are supported as vsyscalls.  */
 # define HAVE_CLOCK_GETTIME64_VSYSCALL  "__vdso_clock_gettime"
 # define HAVE_GETTIMEOFDAY_VSYSCALL     "__vdso_gettimeofday"
-# define HAVE_TIME_VSYSCALL             "__vdso_time"
 # define HAVE_GETCPU_VSYSCALL		"__vdso_getcpu"
 # define HAVE_CLOCK_GETRES64_VSYSCALL   "__vdso_clock_getres"
 
diff --git a/time/time.c b/time/time.c
index 6713bbf452..a37fd2571b 100644
--- a/time/time.c
+++ b/time/time.c
@@ -16,14 +16,13 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <time.h>
-#include <time-clockid.h>
 
 /* Return the time now, and store it in *TIMER if not NULL.  */
 time_t
 time (time_t *timer)
 {
   struct timespec ts;
-  __clock_gettime (TIME_CLOCK_GETTIME_CLOCKID, &ts);
+  __clock_gettime (CLOCK_REALTIME, &ts);
 
   if (timer)
     *timer = ts.tv_sec;
-- 
2.34.1