[v3,3/3] y2038: Convert thrd_sleep to support 64 bit time
Commit Message
The thrd_sleep function has been converted to support 64 bit time.
It was also necessary to provide Linux specific copy of it to avoid
problems on i686-gnu (i.e. HURD) port, which is not providing
clock_nanosleep() supporting 64 bit time.
The thrd_sleep is a wrapper on POSIX threads to provide C11 standard
threads interface. It directly calls __clock_nanosleep64().
Build tests:
./src/scripts/build-many-glibcs.py glibcs
---
Changes for v2:
- Add aliasing and __thrd_sleep64 definition to linux specific
version of thrd_priv.h
- Reformat the thrd_sleep.c to not exceed the line width
Changes for v3:
- Add space before '*', not after
- Pass NULL as the second argument to __thrd_sleep64 when __thrd_sleep
is called on ports with __TIMESIZE != 64
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
sysdeps/unix/sysv/linux/thrd_priv.h | 4 ++
sysdeps/unix/sysv/linux/thrd_sleep.c | 56 ++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
create mode 100644 sysdeps/unix/sysv/linux/thrd_sleep.c
@@ -21,6 +21,7 @@
#if __TIMESIZE == 64
# define __cnd_timedwait64 __cnd_timedwait
# define __mtx_timedlock64 __mtx_timedlock
+# define __thrd_sleep64 __thrd_sleep
#else
extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex,
const struct __timespec64 *restrict time_point);
@@ -28,4 +29,7 @@ libpthread_hidden_proto (__cnd_timedwait64)
extern int __mtx_timedlock64 (mtx_t *restrict mutex,
const struct __timespec64 *restrict time_point);
libpthread_hidden_proto (__mtx_timedlock64)
+extern int __thrd_sleep64 (const struct __timespec64 *time_point,
+ struct __timespec64 *remaining);
+libpthread_hidden_proto (__thrd_sleep64)
#endif
new file mode 100644
@@ -0,0 +1,56 @@
+/* C11 threads thread sleep implementation - Linux variant.
+ 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 <sysdep-cancel.h>
+
+#include "thrd_priv.h"
+
+int
+__thrd_sleep64 (const struct __timespec64 *time_point,
+ struct __timespec64 *remaining)
+{
+ int ret = __clock_nanosleep_time64 (CLOCK_REALTIME, 0, time_point,
+ remaining);
+ /* C11 states thrd_sleep function returns -1 if it has been interrupted
+ by a signal, or a negative value if it fails. */
+ switch (ret)
+ {
+ case 0: return 0;
+ case EINTR: return -1;
+ default: return -2;
+ }
+}
+
+#if __TIMESIZE != 64
+libpthread_hidden_def (__thrd_sleep64)
+
+int
+__thrd_sleep (const struct timespec *time_point, struct timespec *remaining)
+{
+ const struct __timespec64 treq64 = valid_timespec_to_timespec64 (*time_point);
+ struct __timespec64 trem64;
+
+ int ret = __thrd_sleep64 (&treq64, remaining != NULL ? &trem64 : NULL);
+ if (ret == -1 && remaining != NULL)
+ *remaining = valid_timespec64_to_timespec (trem64);
+
+ return ret;
+}
+#endif
+weak_alias (__thrd_sleep, thrd_sleep)