diff mbox series

[v2,10/14] linux: Add time64 support for nanosleep

Message ID 20200908145738.640039-10-adhemerval.zanella@linaro.org
State New
Headers show
Series [v2,01/14] linux: Simplify clock_getres | expand

Commit Message

Adhemerval Zanella Sept. 8, 2020, 2:57 p.m. UTC
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                      |  9 ++++++
 sysdeps/unix/sysv/linux/nanosleep.c | 50 +++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/nanosleep.c

Comments

Alistair Francis Sept. 16, 2020, 5:16 p.m. UTC | #1
On Tue, Sep 8, 2020 at 8:01 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> 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).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  include/time.h                      |  9 ++++++
>  sysdeps/unix/sysv/linux/nanosleep.c | 50 +++++++++++++++++++++++++++++
>  2 files changed, 59 insertions(+)
>  create mode 100644 sysdeps/unix/sysv/linux/nanosleep.c
>
> diff --git a/include/time.h b/include/time.h
> index 936486e206..edf6cdf829 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;
>
> diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c
> new file mode 100644
> index 0000000000..8f4ee0f744
> --- /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_nanosleep_time64 (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)
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/include/time.h b/include/time.h
index 936486e206..edf6cdf829 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;
 
diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c
new file mode 100644
index 0000000000..8f4ee0f744
--- /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_nanosleep_time64 (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)