Message ID | 20201103091449.20364-2-lukma@denx.de |
---|---|
State | New |
Headers | show |
Series | [v2,1/3] y2038: Convert cnd_timedwait to support 64 bit time | expand |
On Tue, Nov 3, 2020 at 1:15 AM Lukasz Majewski <lukma@denx.de> wrote: > > 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 Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > sysdeps/pthread/thrd_priv.h | 4 +++ > sysdeps/unix/sysv/linux/mtx_timedlock.c | 43 +++++++++++++++++++++++++ > 2 files changed, 47 insertions(+) > create mode 100644 sysdeps/unix/sysv/linux/mtx_timedlock.c > > diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h > index dbfec0df7a..efe453bdec 100644 > --- a/sysdeps/pthread/thrd_priv.h > +++ b/sysdeps/pthread/thrd_priv.h > @@ -26,10 +26,14 @@ > > #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 > > static __always_inline int > diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c > new file mode 100644 > index 0000000000..ef57dd1e41 > --- /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) > -- > 2.20.1 >
On 03/11/2020 06:14, Lukasz Majewski wrote: > 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 > --- > sysdeps/pthread/thrd_priv.h | 4 +++ > sysdeps/unix/sysv/linux/mtx_timedlock.c | 43 +++++++++++++++++++++++++ > 2 files changed, 47 insertions(+) > create mode 100644 sysdeps/unix/sysv/linux/mtx_timedlock.c > > diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h > index dbfec0df7a..efe453bdec 100644 > --- a/sysdeps/pthread/thrd_priv.h > +++ b/sysdeps/pthread/thrd_priv.h > @@ -26,10 +26,14 @@ > > #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 > > static __always_inline int Same as previous patch, I think this should be moved to a Linux internal thread.h header. > diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c > new file mode 100644 > index 0000000000..ef57dd1e41 > --- /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); Space after function name. > +} > +#endif > +weak_alias (__mtx_timedlock, mtx_timedlock) >
diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h index dbfec0df7a..efe453bdec 100644 --- a/sysdeps/pthread/thrd_priv.h +++ b/sysdeps/pthread/thrd_priv.h @@ -26,10 +26,14 @@ #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 static __always_inline int diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c new file mode 100644 index 0000000000..ef57dd1e41 --- /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)