* [PATCH v3 1/3] y2038: Convert cnd_timedwait to support 64 bit time
@ 2020-11-12 14:22 Lukasz Majewski
2020-11-12 14:22 ` [PATCH v3 2/3] y2038: Convert mtx_timedlock " Lukasz Majewski
2020-11-12 14:22 ` [PATCH v3 3/3] y2038: Convert thrd_sleep " Lukasz Majewski
0 siblings, 2 replies; 3+ messages in thread
From: Lukasz Majewski @ 2020-11-12 14:22 UTC (permalink / raw)
To: Joseph Myers, Paul Eggert, Adhemerval Zanella
Cc: Alistair Francis, Arnd Bergmann, Alistair Francis, GNU C Library,
Florian Weimer, Carlos O'Donell, Stepan Golosunov,
Andreas Schwab, Zack Weinberg, Lukasz Majewski
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.
Moreover, a linux specific copy of thrd_priv.h header file has been
added as well.
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
---
Changes for v2:
- Create linux specific version of thrd_priv.h
Changes for v3:
- Add space before '*', not after
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
sysdeps/unix/sysv/linux/cnd_timedwait.c | 44 +++++++++++++++++++++++++
sysdeps/unix/sysv/linux/thrd_priv.h | 27 +++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 sysdeps/unix/sysv/linux/cnd_timedwait.c
create mode 100644 sysdeps/unix/sysv/linux/thrd_priv.h
diff --git a/sysdeps/unix/sysv/linux/cnd_timedwait.c b/sysdeps/unix/sysv/linux/cnd_timedwait.c
new file mode 100644
index 0000000000..90c54aaacb
--- /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)
diff --git a/sysdeps/unix/sysv/linux/thrd_priv.h b/sysdeps/unix/sysv/linux/thrd_priv.h
new file mode 100644
index 0000000000..fb12ac1615
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/thrd_priv.h
@@ -0,0 +1,27 @@
+/* Internal C11 threads definitions - linux version
+ 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 <sysdeps/pthread/thrd_priv.h>
+
+#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
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 2/3] y2038: Convert mtx_timedlock to support 64 bit time
2020-11-12 14:22 [PATCH v3 1/3] y2038: Convert cnd_timedwait to support 64 bit time Lukasz Majewski
@ 2020-11-12 14:22 ` Lukasz Majewski
2020-11-12 14:22 ` [PATCH v3 3/3] y2038: Convert thrd_sleep " Lukasz Majewski
1 sibling, 0 replies; 3+ messages in thread
From: Lukasz Majewski @ 2020-11-12 14:22 UTC (permalink / raw)
To: Joseph Myers, Paul Eggert, Adhemerval Zanella
Cc: Alistair Francis, Arnd Bergmann, Alistair Francis, GNU C Library,
Florian Weimer, Carlos O'Donell, Stepan Golosunov,
Andreas Schwab, Zack Weinberg, Lukasz Majewski
The mtx_timedlock 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_mutex_timedlock() supporting 64 bit time.
The mtx_timedlock is a wrapper on POSIX threads to provide C11 standard
threads interface. It directly calls __pthread_mutex_timedlock64().
Build tests:
./src/scripts/build-many-glibcs.py glibcs
---
Changes for v2:
- Add aliasing and __mtx_timedlock64 definition to linux specific
version of thrd_priv.h
- Add missing space in __mtx_timedlock64 (mutex, &ts64);
Changes for v3:
- None
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
sysdeps/unix/sysv/linux/mtx_timedlock.c | 43 +++++++++++++++++++++++++
sysdeps/unix/sysv/linux/thrd_priv.h | 4 +++
2 files changed, 47 insertions(+)
create mode 100644 sysdeps/unix/sysv/linux/mtx_timedlock.c
diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c
new file mode 100644
index 0000000000..8dde1d30d4
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mtx_timedlock.c
@@ -0,0 +1,43 @@
+/* C11 threads mutex timed lock 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
+__mtx_timedlock64 (mtx_t *restrict mutex,
+ const struct __timespec64 *restrict time_point)
+{
+ int err_code = __pthread_mutex_timedlock64 ((pthread_mutex_t *)mutex,
+ time_point);
+ return thrd_err_map (err_code);
+}
+
+#if __TIMESIZE != 64
+libpthread_hidden_def (__mtx_timedlock64)
+
+int
+__mtx_timedlock (mtx_t *restrict mutex,
+ const struct timespec *restrict time_point)
+{
+ struct __timespec64 ts64 = valid_timespec_to_timespec64 (*time_point);
+
+ return __mtx_timedlock64 (mutex, &ts64);
+}
+#endif
+weak_alias (__mtx_timedlock, mtx_timedlock)
diff --git a/sysdeps/unix/sysv/linux/thrd_priv.h b/sysdeps/unix/sysv/linux/thrd_priv.h
index fb12ac1615..5a818d0926 100644
--- a/sysdeps/unix/sysv/linux/thrd_priv.h
+++ b/sysdeps/unix/sysv/linux/thrd_priv.h
@@ -20,8 +20,12 @@
#if __TIMESIZE == 64
# define __cnd_timedwait64 __cnd_timedwait
+# define __mtx_timedlock64 __mtx_timedlock
#else
extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex,
const struct __timespec64 *restrict time_point);
libpthread_hidden_proto (__cnd_timedwait64)
+extern int __mtx_timedlock64 (mtx_t *restrict mutex,
+ const struct __timespec64 *restrict time_point);
+libpthread_hidden_proto (__mtx_timedlock64)
#endif
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 3/3] y2038: Convert thrd_sleep to support 64 bit time
2020-11-12 14:22 [PATCH v3 1/3] y2038: Convert cnd_timedwait to support 64 bit time Lukasz Majewski
2020-11-12 14:22 ` [PATCH v3 2/3] y2038: Convert mtx_timedlock " Lukasz Majewski
@ 2020-11-12 14:22 ` Lukasz Majewski
1 sibling, 0 replies; 3+ messages in thread
From: Lukasz Majewski @ 2020-11-12 14:22 UTC (permalink / raw)
To: Joseph Myers, Paul Eggert, Adhemerval Zanella
Cc: Alistair Francis, Arnd Bergmann, Alistair Francis, GNU C Library,
Florian Weimer, Carlos O'Donell, Stepan Golosunov,
Andreas Schwab, Zack Weinberg, Lukasz Majewski
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
diff --git a/sysdeps/unix/sysv/linux/thrd_priv.h b/sysdeps/unix/sysv/linux/thrd_priv.h
index 5a818d0926..99af8b4ef1 100644
--- a/sysdeps/unix/sysv/linux/thrd_priv.h
+++ b/sysdeps/unix/sysv/linux/thrd_priv.h
@@ -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
diff --git a/sysdeps/unix/sysv/linux/thrd_sleep.c b/sysdeps/unix/sysv/linux/thrd_sleep.c
new file mode 100644
index 0000000000..4797e48f40
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/thrd_sleep.c
@@ -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)
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-12 14:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-12 14:22 [PATCH v3 1/3] y2038: Convert cnd_timedwait to support 64 bit time Lukasz Majewski
2020-11-12 14:22 ` [PATCH v3 2/3] y2038: Convert mtx_timedlock " Lukasz Majewski
2020-11-12 14:22 ` [PATCH v3 3/3] y2038: Convert thrd_sleep " Lukasz Majewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).