d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some minor inaccuracies introduced in r243251.

Browse Source 
Also correct the comment in kern_synch.c which was the source of the
problematic text.

Reviewed by:	kib (previous version)
Approved by:	hrs (mentor)
This commit is contained in:
Benjamin Kaduk 2013-01-05 00:23:26 +00:00
parent befcdd435c
commit 5e9723e271
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
share/man/man9/sleep.9
View File

@ -102,12 +102,11 @@ If
.Fa priority .Fa priority
includes the includes the
.Dv PCATCH .Dv PCATCH
flag, pending flag, pending signals are allowed to interrupt the sleep, otherwise
signals are checked before and after sleeping, otherwise signals are pending signals are ignored during the sleep.
not checked.
If If
.Dv PCATCH .Dv PCATCH
is set and a signal needs to be delivered, is set and a signal becomes pending,
.Er ERESTART .Er ERESTART
is returned if the current system call should be restarted if is returned if the current system call should be restarted if
possible, and possible, and
@ -119,9 +118,10 @@ If the
.Dv PBDRY .Dv PBDRY
flag is specified in addition to flag is specified in addition to
.Dv PCATCH , .Dv PCATCH ,
then the sleeping thread is not stopped upon delivery of then the sleeping thread is not stopped when
.Dv SIGSTOP .Dv SIGSTOP
or other stop action while it is sleeping. becomes pending
or some other stop action occurs while it is sleeping.
Instead, it is woken up, with the assumption Instead, it is woken up, with the assumption
that the stop will occur on reaching a stop that the stop will occur on reaching a stop
point when returning to usermode. point when returning to usermode.

6
sys/kern/kern_synch.c
View File

@ -133,10 +133,10 @@ sleepinit(void)
* General sleep call. Suspends the current thread until a wakeup is * General sleep call. Suspends the current thread until a wakeup is
* performed on the specified identifier. The thread will then be made * performed on the specified identifier. The thread will then be made
* runnable with the specified priority. Sleeps at most timo/hz seconds * runnable with the specified priority. Sleeps at most timo/hz seconds
* (0 means no timeout). If pri includes PCATCH flag, signals are checked * (0 means no timeout). If pri includes the PCATCH flag, let signals
* before and after sleeping, else signals are not checked. Returns 0 if * interrupt the sleep, otherwise ignore them while sleeping. Returns 0 if
* awakened, EWOULDBLOCK if the timeout expires. If PCATCH is set and a * awakened, EWOULDBLOCK if the timeout expires. If PCATCH is set and a
* signal needs to be delivered, ERESTART is returned if the current system * signal becomes pending, ERESTART is returned if the current system
* call should be restarted if possible, and EINTR is returned if the system * call should be restarted if possible, and EINTR is returned if the system
* call should be interrupted by the signal (return EINTR). * call should be interrupted by the signal (return EINTR).
* *