summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2018-04-24 17:19:36 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2018-04-24 17:19:36 +0000
commit60312cdcde144260d48770f5a749146c7d8385e7 (patch)
treef817eab9d8d763b0cb40dc07021ac3de3cf3a57b /lib/libc
parent490e16b7b38810243bee2b9101bb8557b11f5a19 (diff)
Make futex(2) also return ECANCELED in case SA_RESTART was set.
Prodded by and ok mpi@
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/sys/futex.29
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libc/sys/futex.2 b/lib/libc/sys/futex.2
index d8528681ba4..1fc2d080a95 100644
--- a/lib/libc/sys/futex.2
+++ b/lib/libc/sys/futex.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: futex.2,v 1.3 2017/04/28 17:54:24 mpi Exp $
+.\" $OpenBSD: futex.2,v 1.4 2018/04/24 17:19:35 pirofti Exp $
.\"
.\" Copyright (c) 2017 Martin Pieuchot
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: April 28 2017 $
+.Dd $Mdocdate: April 24 2018 $
.Dt FUTEX 2
.Os
.Sh NAME
@@ -122,8 +122,13 @@ The
expired before the thread was woken up
.It Bq Er EINTR
A signal arrived.
+.It Bq Er ECANCELED
+A signal arrived and
+.Fa SA_RESTART
+was set.
.El
.Sh SEE ALSO
+.Xr sigaction 2 ,
.Xr pthread_cond_wait 3 ,
.Xr pthread_mutex_lock 3 ,
.Xr tsleep 9