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

The case of pid == WAIT_MYPGRP for the kern_wait() is already handled

Browse Source 
in kern_wait6(), which is called by kern_wait().  Remove the redundand
check, introduced in r243136, and add a comment noting this, to make
the code less confusing.

The blank lines are added to properly delineate the scope of the
preceeding comments.

Noted by:	"Jukka A. Ukkonen" <jau@iki.fi>
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2013-01-30 13:14:15 +00:00
parent 150facd256
commit 538375d42e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=246118
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/kern_exit.c
View File

@ -1024,20 +1024,18 @@ kern_wait(struct thread *td, pid_t pid, int *status, int options,
struct rusage *rusage)
{
struct __wrusage wru, *wrup;
struct proc *q;
idtype_t idtype;
id_t id;
int ret;
/*
* Translate the special pid values into the (idtype, pid)
* pair for kern_wait6. The WAIT_MYPGRP case is handled by
* kern_wait6() on its own.
*/
if (pid == WAIT_ANY) {
idtype = P_ALL;
id = 0;
} else if (pid == WAIT_MYPGRP) {
idtype = P_PGID;
q = td->td_proc;
PROC_LOCK(q);
id = (id_t)q->p_pgid;
PROC_UNLOCK(q);
} else if (pid < 0) {
idtype = P_PGID;
id = (id_t)-pid;
@ -1045,10 +1043,12 @@ kern_wait(struct thread *td, pid_t pid, int *status, int options,
idtype = P_PID;
id = (id_t)pid;
}
if (rusage != NULL)
wrup = &wru;
else
wrup = NULL;
/*
* For backward compatibility we implicitly add flags WEXITED
* and WTRAPPED here.