[v6,1/3] sysdeps/clock_nanosleep: Use clock_nanosleep_time64 if avaliable
Commit Message
On 10/11/2019 14:44, Andreas Schwab wrote:
> On Nov 10 2019, Alistair Francis wrote:
>
>> On Sun, Nov 10, 2019 at 1:00 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
>>>
>>> This breaks rt/tst-timer on i586 and powerpc and armv7l.
>>
>> I don't understand how. I tested it on ARMv7. Do you have any more
>> details on why it is failing?
>
> I don't know, it just hangs.
>
>> Also is this on a 5.1+ or earlier kernel/headers?
>
> All the latest.
>
> https://build.opensuse.org/package/show/home:Andreas_Schwab:glibc/glibc
>
> Andreas.
>
It is because clock_nanosspe requires to handle EINTR as a possible return
value and update the remaining argument accordingly:
@@ -52,13 +52,10 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec
r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, err, clock_id,
flags, req, rem);
- if (r == 0 || errno != ENOSYS)
- {
- return (INTERNAL_SYSCALL_ERROR_P (r, err)
- ? INTERNAL_SYSCALL_ERRNO (r, err) : 0);
- }
+ if (r != -ENOSYS)
+ return (INTERNAL_SYSCALL_ERROR_P (r, err)
+ ? INTERNAL_SYSCALL_ERRNO (r, err) : 0);
# endif /* __NR_clock_nanosleep_time64 */
- struct timespec ts32, tr32;
if (! in_time_t_range (req->tv_sec))
{
@@ -66,11 +63,12 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec
return -1;
}
- ts32 = valid_timespec64_to_timespec (*req);
+ struct timespec tr32;
+ struct timespec ts32 = valid_timespec64_to_timespec (*req);
r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, err, clock_id, flags,
&ts32, &tr32);
- if (r == 0 && rem != NULL)
+ if (r == -EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
*rem = valid_timespec_to_timespec64 (tr32);
#endif /* __ASSUME_TIME64_SYSCALLS */
@@ -89,7 +87,7 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
treq64 = valid_timespec_to_timespec64 (*req);
r = __clock_nanosleep_time64 (clock_id, flags, &treq64, &trem64);
- if (r == 0 && rem != NULL)
+ if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
*rem = valid_timespec64_to_timespec (trem64);
return r;