diff mbox series

[1/3] y2038: Convert cnd_timedwait to support 64 bit time

Message ID 20201030083816.32495-1-lukma@denx.de
State Superseded
Headers show
Series [1/3] y2038: Convert cnd_timedwait to support 64 bit time | expand

Commit Message

Lukasz Majewski Oct. 30, 2020, 8:38 a.m. UTC
The cnd_timedwait 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
pthread_cond_timedwait() supporting 64 bit time.

The cnd_timedwait is a wrapper on POSIX threads to provide C11 standard
threads interface. It directly calls __pthread_cond_timedwait64().

Build tests:
./src/scripts/build-many-glibcs.py glibcs
---
 nptl/pthreadP.h                         |  1 +
 sysdeps/pthread/thrd_priv.h             |  8 +++++
 sysdeps/unix/sysv/linux/cnd_timedwait.c | 44 +++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/cnd_timedwait.c
diff mbox series

Patch

diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 710b21e890..b8471e4a5a 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -470,6 +470,7 @@  extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
 # define __pthread_rwlock_timedwrlock64 __pthread_rwlock_timedwrlock
 # define __pthread_mutex_clocklock64 __pthread_mutex_clocklock
 # define __pthread_mutex_timedlock64 __pthread_mutex_timedlock
+# define __pthread_mutex_timedlock64 __pthread_mutex_timedlock
 #else
 extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return,
                                      clockid_t clockid,
diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h
index d22ad6f632..dbfec0df7a 100644
--- a/sysdeps/pthread/thrd_priv.h
+++ b/sysdeps/pthread/thrd_priv.h
@@ -24,6 +24,14 @@ 
 #include <errno.h>
 #include "pthreadP.h"	/* For pthread_{mutex,cond}_t definitions.  */
 
+#if __TIMESIZE == 64
+# define __cnd_timedwait64 __cnd_timedwait
+#else
+extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex,
+                              const struct __timespec64* restrict time_point);
+libpthread_hidden_proto (__cnd_timedwait64)
+#endif
+
 static __always_inline int
 thrd_err_map (int err_code)
 {
diff --git a/sysdeps/unix/sysv/linux/cnd_timedwait.c b/sysdeps/unix/sysv/linux/cnd_timedwait.c
new file mode 100644
index 0000000000..5bf5a2d968
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/cnd_timedwait.c
@@ -0,0 +1,44 @@ 
+/* C11 threads conditional timed wait 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 "thrd_priv.h"
+
+int
+__cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex,
+                   const struct __timespec64* restrict time_point)
+{
+  int err_code = __pthread_cond_timedwait64 ((pthread_cond_t *) cond,
+                                             (pthread_mutex_t *) mutex,
+                                             time_point);
+  return thrd_err_map (err_code);
+}
+
+#if __TIMESIZE != 64
+libpthread_hidden_def (__cnd_timedwait64)
+
+int
+__cnd_timedwait (cnd_t *restrict cond, mtx_t *restrict mutex,
+                 const struct timespec* restrict time_point)
+{
+  struct __timespec64 ts64 = valid_timespec_to_timespec64 (*time_point);
+
+  return __cnd_timedwait64(cond, mutex, &ts64);
+}
+#endif
+weak_alias (__cnd_timedwait, cnd_timedwait)