futex.2: Fix descriptions of various timeouts

Reported-by: Thomas Gleixner <tglx@linutronix.de>
Reported-by: Darren Hart <dvhart@infradead.org>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
This commit is contained in:
Michael Kerrisk 2016-06-23 12:43:51 +02:00
parent 017d194b0b
commit 8064bfa536
1 changed files with 23 additions and 13 deletions

View File

@ -242,15 +242,15 @@ and
.\" commit 337f13046ff03717a9e99675284a817527440a49
operations.
If this option is set, the kernel treats
If this option is set, the kernel measures the
.I timeout
as an absolute time based on
.BR CLOCK_REALTIME .
against the
.BR CLOCK_REALTIME
clock.
If this option is not set, the kernel treats
If this option is not set, the kernel measures the
.I timeout
as a relative time,
measured against the
against the
.BR CLOCK_MONOTONIC
clock.
.PP
@ -300,8 +300,8 @@ value change and will not start to sleep.
If the
.I timeout
argument is non-NULL, its contents specify a relative timeout for the wait,
measured according to the
is not NULL, the structure it points to specifies
a relative timeout for the wait, measured according to the
.BR CLOCK_MONOTONIC
clock.
(This interval will be rounded up to the system clock granularity,
@ -691,6 +691,15 @@ See the description of
.BR FUTEX_WAKE_BITSET
for further details.
If
.I timeout
is not NULL, the structure it points to specifies
an absolute timeout for the wait operation.
If
.I timeout
is NULL, the operation can block indefinitely.
The
.I uaddr2
argument is ignored.
@ -1027,7 +1036,10 @@ and performs deadlock detection.
The
.I timeout
argument provides a timeout for the lock attempt.
It is interpreted as an absolute time, measured against the
If
.I timeout
is not NULL, the structure it points to specifies
an absolute timeout, measured against the
.BR CLOCK_REALTIME
clock.
If
@ -1186,10 +1198,8 @@ operation fails with the error
If
.I timeout
is not NULL, it specifies a timeout for the wait operation;
this timeout is interpreted as outlined above in the description of the
.BR FUTEX_CLOCK_REALTIME
option.
is not NULL, the structure it points to specifies
an absolute timeout for the wait operation.
If
.I timeout
is NULL, the operation can block indefinitely.