[23/23] linux: Add time64 support for nanosleep

Message ID 20200713171025.3661832-23-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • [01/23] linux: Simplify clock_adjtime
Related show

Commit Message

Alejandro Colomar via Libc-alpha July 13, 2020, 5:10 p.m.
It uses __clock_nanosleep64 and adds the __nanosleep64 symbol.

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).
---
 include/time.h                            | 19 ++++++---
 sysdeps/unix/sysv/linux/clock_nanosleep.c |  8 ++--
 sysdeps/unix/sysv/linux/nanosleep.c       | 50 +++++++++++++++++++++++
 3 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/nanosleep.c

-- 
2.25.1

Comments

Alejandro Colomar via Libc-alpha Aug. 24, 2020, 6:34 p.m. | #1
Ping.

On 13/07/2020 14:10, Adhemerval Zanella wrote:
> It uses __clock_nanosleep64 and adds the __nanosleep64 symbol.

> 

> Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15

> kernel).

> ---

>  include/time.h                            | 19 ++++++---

>  sysdeps/unix/sysv/linux/clock_nanosleep.c |  8 ++--

>  sysdeps/unix/sysv/linux/nanosleep.c       | 50 +++++++++++++++++++++++

>  3 files changed, 68 insertions(+), 9 deletions(-)

>  create mode 100644 sysdeps/unix/sysv/linux/nanosleep.c

> 

> diff --git a/include/time.h b/include/time.h

> index 936486e206..ad0476be05 100644

> --- a/include/time.h

> +++ b/include/time.h

> @@ -271,6 +271,15 @@ extern struct tm *__tz_convert (__time64_t timer, int use_localtime,

>  extern int __nanosleep (const struct timespec *__requested_time,

>  			struct timespec *__remaining);

>  hidden_proto (__nanosleep)

> +#if __TIMESIZE == 64

> +# define __nanosleep64 __nanosleep

> +#else

> +extern int __nanosleep64 (const struct __timespec64 *__requested_time,

> +			  struct __timespec64 *__remaining);

> +hidden_proto (__nanosleep64)

> +#endif

> +

> +

>  extern int __getdate_r (const char *__string, struct tm *__resbufp)

>    attribute_hidden;

>  

> @@ -294,14 +303,14 @@ libc_hidden_proto (__difftime64)

>  extern double __difftime (time_t time1, time_t time0);

>  

>  #if __TIMESIZE == 64

> -# define __clock_nanosleep_time64 __clock_nanosleep

> +# define __clock_nanosleep64 __clock_nanosleep

>  # define __clock_gettime64 __clock_gettime

>  # define __timespec_get64 __timespec_get

>  #else

> -extern int __clock_nanosleep_time64 (clockid_t clock_id,

> -                                     int flags, const struct __timespec64 *req,

> -                                     struct __timespec64 *rem);

> -libc_hidden_proto (__clock_nanosleep_time64)

> +extern int __clock_nanosleep64 (clockid_t clock_id,

> +                                int flags, const struct __timespec64 *req,

> +                                struct __timespec64 *rem);

> +libc_hidden_proto (__clock_nanosleep64)

>  extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp);

>  libc_hidden_proto (__clock_gettime64)

>  extern int __timespec_get64 (struct __timespec64 *ts, int base);

> diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c

> index 6ad3321435..697e403ac8 100644

> --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c

> +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c

> @@ -27,8 +27,8 @@

>  /* We can simply use the syscall.  The CPU clocks are not supported

>     with this function.  */

>  int

> -__clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec64 *req,

> -                          struct __timespec64 *rem)

> +__clock_nanosleep64 (clockid_t clock_id, int flags,

> +		     const struct __timespec64 *req, struct __timespec64 *rem)

>  {

>    if (clock_id == CLOCK_THREAD_CPUTIME_ID)

>      return EINVAL;

> @@ -68,7 +68,7 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec

>  }

>  

>  #if __TIMESIZE != 64

> -libc_hidden_def (__clock_nanosleep_time64)

> +libc_hidden_def (__clock_nanosleep64)

>  

>  int

>  __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,

> @@ -78,7 +78,7 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,

>    struct __timespec64 treq64, trem64;

>  

>    treq64 = valid_timespec_to_timespec64 (*req);

> -  r = __clock_nanosleep_time64 (clock_id, flags, &treq64, &trem64);

> +  r = __clock_nanosleep64 (clock_id, flags, &treq64, &trem64);

>  

>    if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)

>      *rem = valid_timespec64_to_timespec (trem64);

> diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c

> new file mode 100644

> index 0000000000..7e13a98b4c

> --- /dev/null

> +++ b/sysdeps/unix/sysv/linux/nanosleep.c

> @@ -0,0 +1,50 @@

> +/* High-resolution sleep.

> +   Copyright (C) 2020 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 <time.h>

> +#include <errno.h>

> +

> +int

> +__nanosleep64 (const struct __timespec64 *req, struct __timespec64 *rem)

> +{

> +  int ret = __clock_nanosleep64 (CLOCK_REALTIME, 0, req, rem);

> +  if (ret != 0)

> +    {

> +      __set_errno (ret);

> +      return -1;

> +    }

> +  return 0;

> +}

> +#if __TIMESIZE != 64

> +libc_hidden_def (__nanosleep64)

> +

> +int

> +__nanosleep (const struct timespec *req, struct timespec *rem)

> +{

> +  struct __timespec64 treq64, trem64;

> +

> +  treq64 = valid_timespec_to_timespec64 (*req);

> +  int ret = __nanosleep64 (&treq64, &trem64);

> +

> +  if (ret != 0 && errno == EINTR && rem != NULL)

> +    *rem = valid_timespec64_to_timespec (trem64);

> +  return ret;

> +}

> +#endif

> +libc_hidden_def (__nanosleep)

> +weak_alias (__nanosleep, nanosleep)

>

Patch

diff --git a/include/time.h b/include/time.h
index 936486e206..ad0476be05 100644
--- a/include/time.h
+++ b/include/time.h
@@ -271,6 +271,15 @@  extern struct tm *__tz_convert (__time64_t timer, int use_localtime,
 extern int __nanosleep (const struct timespec *__requested_time,
 			struct timespec *__remaining);
 hidden_proto (__nanosleep)
+#if __TIMESIZE == 64
+# define __nanosleep64 __nanosleep
+#else
+extern int __nanosleep64 (const struct __timespec64 *__requested_time,
+			  struct __timespec64 *__remaining);
+hidden_proto (__nanosleep64)
+#endif
+
+
 extern int __getdate_r (const char *__string, struct tm *__resbufp)
   attribute_hidden;
 
@@ -294,14 +303,14 @@  libc_hidden_proto (__difftime64)
 extern double __difftime (time_t time1, time_t time0);
 
 #if __TIMESIZE == 64
-# define __clock_nanosleep_time64 __clock_nanosleep
+# define __clock_nanosleep64 __clock_nanosleep
 # define __clock_gettime64 __clock_gettime
 # define __timespec_get64 __timespec_get
 #else
-extern int __clock_nanosleep_time64 (clockid_t clock_id,
-                                     int flags, const struct __timespec64 *req,
-                                     struct __timespec64 *rem);
-libc_hidden_proto (__clock_nanosleep_time64)
+extern int __clock_nanosleep64 (clockid_t clock_id,
+                                int flags, const struct __timespec64 *req,
+                                struct __timespec64 *rem);
+libc_hidden_proto (__clock_nanosleep64)
 extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp);
 libc_hidden_proto (__clock_gettime64)
 extern int __timespec_get64 (struct __timespec64 *ts, int base);
diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c
index 6ad3321435..697e403ac8 100644
--- a/sysdeps/unix/sysv/linux/clock_nanosleep.c
+++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c
@@ -27,8 +27,8 @@ 
 /* We can simply use the syscall.  The CPU clocks are not supported
    with this function.  */
 int
-__clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec64 *req,
-                          struct __timespec64 *rem)
+__clock_nanosleep64 (clockid_t clock_id, int flags,
+		     const struct __timespec64 *req, struct __timespec64 *rem)
 {
   if (clock_id == CLOCK_THREAD_CPUTIME_ID)
     return EINVAL;
@@ -68,7 +68,7 @@  __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec
 }
 
 #if __TIMESIZE != 64
-libc_hidden_def (__clock_nanosleep_time64)
+libc_hidden_def (__clock_nanosleep64)
 
 int
 __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
@@ -78,7 +78,7 @@  __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
   struct __timespec64 treq64, trem64;
 
   treq64 = valid_timespec_to_timespec64 (*req);
-  r = __clock_nanosleep_time64 (clock_id, flags, &treq64, &trem64);
+  r = __clock_nanosleep64 (clock_id, flags, &treq64, &trem64);
 
   if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
     *rem = valid_timespec64_to_timespec (trem64);
diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c
new file mode 100644
index 0000000000..7e13a98b4c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/nanosleep.c
@@ -0,0 +1,50 @@ 
+/* High-resolution sleep.
+   Copyright (C) 2020 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 <time.h>
+#include <errno.h>
+
+int
+__nanosleep64 (const struct __timespec64 *req, struct __timespec64 *rem)
+{
+  int ret = __clock_nanosleep64 (CLOCK_REALTIME, 0, req, rem);
+  if (ret != 0)
+    {
+      __set_errno (ret);
+      return -1;
+    }
+  return 0;
+}
+#if __TIMESIZE != 64
+libc_hidden_def (__nanosleep64)
+
+int
+__nanosleep (const struct timespec *req, struct timespec *rem)
+{
+  struct __timespec64 treq64, trem64;
+
+  treq64 = valid_timespec_to_timespec64 (*req);
+  int ret = __nanosleep64 (&treq64, &trem64);
+
+  if (ret != 0 && errno == EINTR && rem != NULL)
+    *rem = valid_timespec64_to_timespec (trem64);
+  return ret;
+}
+#endif
+libc_hidden_def (__nanosleep)
+weak_alias (__nanosleep, nanosleep)