]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Y2038: add function __nanosleep64
authorAlbert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
Thu, 7 Sep 2017 22:42:04 +0000 (00:42 +0200)
committerAlbert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
Wed, 24 Oct 2018 10:53:27 +0000 (12:53 +0200)
posix/Makefile
posix/Versions
posix/nanosleep64.c [new file with mode: 0644]

index a66d6db0bbc41fa116bd48447ede85db0377b86d..f40096c647b08da13cce815950561ed7f0f8eb77 100644 (file)
@@ -63,7 +63,7 @@ routines :=                                                                 \
        spawnattr_setsigmask spawnattr_setschedpolicy spawnattr_setschedparam \
        posix_madvise                                                         \
        get_child_max sched_cpucount sched_cpualloc sched_cpufree             \
-       sched_rr_gi64
+       sched_rr_gi64 nanosleep64
 
 aux            := init-posix environ
 tests          := test-errno tstgetopt testfnm runtests runptests \
index deb1be1ec8d3ef3f182587ec2f21c5f3227ff182..56b8f6f21729b98aec233cfab577d534940f26ef 100644 (file)
@@ -139,6 +139,7 @@ libc {
   }
   GLIBC_2.29 {
     __sched_rr_get_interval_time64;
+    __nanosleep64;
   }
   GLIBC_PRIVATE {
     __libc_fork; __libc_pread; __libc_pwrite;
diff --git a/posix/nanosleep64.c b/posix/nanosleep64.c
new file mode 100644 (file)
index 0000000..ae4805d
--- /dev/null
@@ -0,0 +1,56 @@
+/* Pause execution for a number of nanoseconds
+
+   Copyright (C) 2018 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <time.h>
+
+/* Pause execution for a number of nanoseconds.  */
+int
+__nanosleep64 (const struct __timespec64 *requested_time,
+                struct __timespec64 *remaining)
+{
+  struct timespec treq32, *treqp32 = NULL;
+  struct timespec trem32, *tremp32 = NULL;
+
+  if (requested_time)
+    {
+      if (requested_time->tv_sec > INT_MAX)
+        {
+          __set_errno(EOVERFLOW);
+          return -1;
+        }
+      treq32.tv_sec = requested_time->tv_sec;
+      treq32.tv_nsec = requested_time->tv_nsec;
+      treqp32 = & treq32;
+    }
+
+  if (remaining)
+    tremp32 = &trem32;
+
+  int result = __nanosleep(treqp32, tremp32);
+
+  if (result == 1 && errno == EINTR && remaining)
+    {
+      remaining->tv_sec = trem32.tv_sec;
+      remaining->tv_nsec = trem32.tv_nsec;
+      remaining->tv_pad = 0;
+    }
+
+  return result;
+}