X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=original%2Fman7%2Fsignal.7;fp=original%2Fman7%2Fsignal.7;h=0af36888cd7bf3b6425c82abb39b16447301a587;hb=5a6975a34ce39b00428a2442e0615f3b41e0bb3f;hp=8cc56bc9070efb71fcb406fd41b48061a51ebd04;hpb=770ab0aeba6ab2cb25b451b079afbcf5837938d6;p=linuxjm%2FLDP_man-pages.git

diff --git a/original/man7/signal.7 b/original/man7/signal.7
index 8cc56bc9..0af36888 100644
--- a/original/man7/signal.7
+++ b/original/man7/signal.7
@@ -43,7 +43,7 @@
 .\"     Added section on stop/cont signals interrupting syscalls.
 .\" 2008-10-05, mtk: various additions
 .\"
-.TH SIGNAL 7  2013-07-30 "Linux" "Linux Programmer's Manual"
+.TH SIGNAL 7  2014-10-15 "Linux" "Linux Programmer's Manual"
 .SH NAME
 signal \- overview of signals
 .SH DESCRIPTION
@@ -671,10 +671,12 @@ Socket interfaces:
 .BR connect (2),
 .BR recv (2),
 .BR recvfrom (2),
+.BR recvmmsg (2),
 .BR recvmsg (2),
 .BR send (2),
 .BR sendto (2),
 and
+.\" FIXME . What about sendmmsg()?
 .BR sendmsg (2),
 unless a timeout has been set on the socket (see below).
 .IP *
@@ -696,6 +698,10 @@ and
 (since Linux 2.6.22; beforehand, always failed with
 .BR EINTR ).
 .IP *
+.BR pthread_mutex_lock (3),
+.BR pthread_cond_wait (3),
+and related APIs.
+.IP *
 POSIX semaphore interfaces:
 .BR sem_wait (3)
 and
@@ -715,24 +721,30 @@ when interrupted by a signal handler:
 .\" on interruption by a signal handler.
 .RS 4
 .IP * 2
-Socket interfaces, when a timeout has been set on the socket using
+"Input" socket interfaces, when a timeout
+.RB ( SO_RCVTIMEO )
+has been set on the socket using
 .BR setsockopt (2):
 .BR accept (2),
 .BR recv (2),
 .BR recvfrom (2),
+.BR recvmmsg (2)
+(also with a non-NULL
+.IR timeout
+argument),
 and
-.BR recvmsg (2),
-if a receive timeout
+.BR recvmsg (2).
+.IP *
+"Output" socket interfaces, when a timeout
 .RB ( SO_RCVTIMEO )
-has been set;
+has been set on the socket using
+.BR setsockopt (2):
 .BR connect (2),
 .BR send (2),
 .BR sendto (2),
 and
-.BR sendmsg (2),
-if a send timeout
-.RB ( SO_SNDTIMEO )
-has been set.
+.\" FIXME . What about sendmmsg()?
+.BR sendmsg (2).
 .IP *
 Interfaces used to wait for signals:
 .BR pause (2),
@@ -789,20 +801,29 @@ on other systems.
 The Linux interfaces that display this behavior are:
 .RS 4
 .IP * 2
-Socket interfaces, when a timeout has been set on the socket using
+"Input" socket interfaces, when a timeout
+.RB ( SO_RCVTIMEO )
+has been set on the socket using
 .BR setsockopt (2):
 .BR accept (2),
 .BR recv (2),
 .BR recvfrom (2),
+.BR recvmmsg (2)
+(also with a non-NULL
+.IR timeout
+argument),
 and
-.BR recvmsg (2),
-if a receive timeout
+.BR recvmsg (2).
+.IP *
+"Output" socket interfaces, when a timeout
 .RB ( SO_RCVTIMEO )
-has been set;
+has been set on the socket using
+.BR setsockopt (2):
 .BR connect (2),
 .BR send (2),
 .BR sendto (2),
 and
+.\" FIXME . What about sendmmsg()?
 .BR sendmsg (2),
 if a send timeout
 .RB ( SO_SNDTIMEO )
@@ -882,7 +903,7 @@ POSIX.1, except as noted.
 .BR pthreads (7),
 .BR sigevent (7)
 .SH COLOPHON
-This page is part of release 3.68 of the Linux
+This page is part of release 3.75 of the Linux
 .I man-pages
 project.
 A description of the project,