Message ID | 20190717084310.28424-1-mac@mcrowe.com |
---|---|
State | New |
Headers | show |
Series | nptl: Add POSIX-proposed _clock functions to hppa pthread.h | expand |
* Mike Crowe: > diff --git a/ChangeLog b/ChangeLog > index 3d884f2925..c2e3be57d2 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,10 @@ > +2019-07-17 Mike Crowe <mac@mcrowe.com> > + > + * sysdeps/unix/sysv/linux/hppa/pthread.h: Add declarations of > + functions recently added to sysdeps/nptl/pthread.h: > + pthread_mutex_clocklock, pthread_rwlock_clockrdlock, > + pthread_rwlock_clockwrlock and pthread_cond_clockwait. > + Can you rebase this on current master? The index hash does not seem to be valid outside your tree. Thanks, Florian
On Wednesday 17 July 2019 at 10:47:26 +0200, Florian Weimer wrote: > * Mike Crowe: > > > diff --git a/ChangeLog b/ChangeLog > > index 3d884f2925..c2e3be57d2 100644 > > --- a/ChangeLog > > +++ b/ChangeLog > > @@ -1,3 +1,10 @@ > > +2019-07-17 Mike Crowe <mac@mcrowe.com> > > + > > + * sysdeps/unix/sysv/linux/hppa/pthread.h: Add declarations of > > + functions recently added to sysdeps/nptl/pthread.h: > > + pthread_mutex_clocklock, pthread_rwlock_clockrdlock, > > + pthread_rwlock_clockwrlock and pthread_cond_clockwait. > > + > > Can you rebase this on current master? The index hash does not seem to > be valid outside your tree. It's on top of https://sourceware.org/ml/libc-alpha/2019-07/msg00298.html Shall I swap them over and repost both? Thanks. Mike.
* Mike Crowe: > On Wednesday 17 July 2019 at 10:47:26 +0200, Florian Weimer wrote: >> * Mike Crowe: >> >> > diff --git a/ChangeLog b/ChangeLog >> > index 3d884f2925..c2e3be57d2 100644 >> > --- a/ChangeLog >> > +++ b/ChangeLog >> > @@ -1,3 +1,10 @@ >> > +2019-07-17 Mike Crowe <mac@mcrowe.com> >> > + >> > + * sysdeps/unix/sysv/linux/hppa/pthread.h: Add declarations of >> > + functions recently added to sysdeps/nptl/pthread.h: >> > + pthread_mutex_clocklock, pthread_rwlock_clockrdlock, >> > + pthread_rwlock_clockwrlock and pthread_cond_clockwait. >> > + >> >> Can you rebase this on current master? The index hash does not seem to >> be valid outside your tree. > > It's on top of https://sourceware.org/ml/libc-alpha/2019-07/msg00298.html > > Shall I swap them over and repost both? Ah, no need for that then. I verified that this fixes the hppa build issue. Thanks, Florian
On 17/07/2019 09:44, Florian Weimer wrote: > * Mike Crowe: > >> On Wednesday 17 July 2019 at 10:47:26 +0200, Florian Weimer wrote: >>> * Mike Crowe: >>> >>>> diff --git a/ChangeLog b/ChangeLog >>>> index 3d884f2925..c2e3be57d2 100644 >>>> --- a/ChangeLog >>>> +++ b/ChangeLog >>>> @@ -1,3 +1,10 @@ >>>> +2019-07-17 Mike Crowe <mac@mcrowe.com> >>>> + >>>> + * sysdeps/unix/sysv/linux/hppa/pthread.h: Add declarations of >>>> + functions recently added to sysdeps/nptl/pthread.h: >>>> + pthread_mutex_clocklock, pthread_rwlock_clockrdlock, >>>> + pthread_rwlock_clockwrlock and pthread_cond_clockwait. >>>> + >>> >>> Can you rebase this on current master? The index hash does not seem to >>> be valid outside your tree. >> >> It's on top of https://sourceware.org/ml/libc-alpha/2019-07/msg00298.html >> >> Shall I swap them over and repost both? > > Ah, no need for that then. > > I verified that this fixes the hppa build issue. > > Thanks, > Florian > LGTM as well, I think next step is to consolidate hppa pthread.h. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
On 7/17/19 1:00 PM, Adhemerval Zanella wrote: > > > On 17/07/2019 09:44, Florian Weimer wrote: >> * Mike Crowe: >> >>> On Wednesday 17 July 2019 at 10:47:26 +0200, Florian Weimer wrote: >>>> * Mike Crowe: >>>> >>>>> diff --git a/ChangeLog b/ChangeLog >>>>> index 3d884f2925..c2e3be57d2 100644 >>>>> --- a/ChangeLog >>>>> +++ b/ChangeLog >>>>> @@ -1,3 +1,10 @@ >>>>> +2019-07-17 Mike Crowe <mac@mcrowe.com> >>>>> + >>>>> + * sysdeps/unix/sysv/linux/hppa/pthread.h: Add declarations of >>>>> + functions recently added to sysdeps/nptl/pthread.h: >>>>> + pthread_mutex_clocklock, pthread_rwlock_clockrdlock, >>>>> + pthread_rwlock_clockwrlock and pthread_cond_clockwait. >>>>> + >>>> >>>> Can you rebase this on current master? The index hash does not seem to >>>> be valid outside your tree. >>> >>> It's on top of https://sourceware.org/ml/libc-alpha/2019-07/msg00298.html >>> >>> Shall I swap them over and repost both? >> >> Ah, no need for that then. >> >> I verified that this fixes the hppa build issue. >> >> Thanks, >> Florian >> > > LGTM as well, I think next step is to consolidate hppa pthread.h. > > Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > Thanks for pushing this. This looks good to me also, and if Florian tested it fixes things then we're good.
diff --git a/ChangeLog b/ChangeLog index 3d884f2925..c2e3be57d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-07-17 Mike Crowe <mac@mcrowe.com> + + * sysdeps/unix/sysv/linux/hppa/pthread.h: Add declarations of + functions recently added to sysdeps/nptl/pthread.h: + pthread_mutex_clocklock, pthread_rwlock_clockrdlock, + pthread_rwlock_clockwrlock and pthread_cond_clockwait. + 2019-07-16 Mike Crowe <mac@mcrowe.com> * nptl/forward.c: Remove unnecessary __pthread_cond_clockwait and diff --git a/sysdeps/unix/sysv/linux/hppa/pthread.h b/sysdeps/unix/sysv/linux/hppa/pthread.h index 45e706c037..5a1c641515 100644 --- a/sysdeps/unix/sysv/linux/hppa/pthread.h +++ b/sysdeps/unix/sysv/linux/hppa/pthread.h @@ -746,6 +746,13 @@ extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex, __abstime) __THROWNL __nonnull ((1, 2)); #endif +#ifdef __USE_GNU +extern int pthread_mutex_clocklock (pthread_mutex_t *__restrict __mutex, + clockid_t __clockid, + const struct timespec *__restrict + __abstime) __THROWNL __nonnull ((1, 3)); +#endif + /* Unlock a mutex. */ extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROWNL __nonnull ((1)); @@ -885,6 +892,13 @@ extern int pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock, __abstime) __THROWNL __nonnull ((1, 2)); # endif +# ifdef __USE_GNU +extern int pthread_rwlock_clockrdlock (pthread_rwlock_t *__restrict __rwlock, + clockid_t __clockid, + const struct timespec *__restrict + __abstime) __THROWNL __nonnull ((1, 3)); +# endif + /* Acquire write lock for RWLOCK. */ extern int pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock) __THROWNL __nonnull ((1)); @@ -900,6 +914,13 @@ extern int pthread_rwlock_timedwrlock (pthread_rwlock_t *__restrict __rwlock, __abstime) __THROWNL __nonnull ((1, 2)); # endif +# ifdef __USE_GNU +extern int pthread_rwlock_clockwrlock (pthread_rwlock_t *__restrict __rwlock, + clockid_t __clockid, + const struct timespec *__restrict + __abstime) __THROWNL __nonnull ((1, 3)); +# endif + /* Unlock RWLOCK. */ extern int pthread_rwlock_unlock (pthread_rwlock_t *__rwlock) __THROWNL __nonnull ((1)); @@ -979,6 +1000,21 @@ extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond, const struct timespec *__restrict __abstime) __nonnull ((1, 2, 3)); +# ifdef __USE_GNU +/* Wait for condition variable COND to be signaled or broadcast until + ABSTIME measured by the specified clock. MUTEX is assumed to be + locked before. CLOCK is the clock to use. ABSTIME is an absolute + time specification against CLOCK's epoch. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern int pthread_cond_clockwait (pthread_cond_t *__restrict __cond, + pthread_mutex_t *__restrict __mutex, + __clockid_t __clock_id, + const struct timespec *__restrict __abstime) + __nonnull ((1, 2, 4)); +# endif + /* Functions for handling condition variable attributes. */ /* Initialize condition variable attribute ATTR. */