Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Nov 2012 23:24:08 +0100
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        Konstantin Belousov <kib@FreeBSD.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org
Subject:   Re: svn commit: r243142 - in head/sys: fs/nfsclient kern sys
Message-ID:  <20121124222408.GH1460@garage.freebsd.pl>
In-Reply-To: <201211160825.qAG8P6v6047507@svn.freebsd.org>
References:  <201211160825.qAG8P6v6047507@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--6lXr1rPCNTf1w0X8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Nov 16, 2012 at 08:25:06AM +0000, Konstantin Belousov wrote:
> Author: kib
> Date: Fri Nov 16 08:25:06 2012
> New Revision: 243142
> URL: http://svnweb.freebsd.org/changeset/base/243142
>=20
> Log:
>   In pget(9), if PGET_NOTWEXIT flag is not specified, also search the
>   zombie list for the pid. This allows several kern.proc sysctls to
>   report useful information for zombies.
>  =20
>   Hold the allproc_lock around all searches instead of relocking it.
>   Remove private pfind_locked() from the new nfs client code.
>  =20
>   Requested and reviewed by:	pjd
>   Tested by:	pho
>   MFC after:	3 weeks
[...]
> @@ -364,12 +374,16 @@ pget(pid_t pid, int flags, struct proc *
>  	struct proc *p;
>  	int error;
> =20
> +	sx_slock(&allproc_lock);
>  	if (pid <=3D PID_MAX)
> -		p =3D pfind(pid);
> +		p =3D pfind_locked(pid);
>  	else if ((flags & PGET_NOTID) =3D=3D 0)
> -		p =3D pfind_tid(pid);
> +		p =3D pfind_tid_locked(pid);
>  	else
>  		p =3D NULL;
> +	if (p =3D=3D NULL && (flags & PGET_NOTWEXIT) =3D=3D 0)
> +		p =3D zpfind_locked(pid);
> +	sx_sunlock(&allproc_lock);
>  	if (p =3D=3D NULL)
>  		return (ESRCH);

I think we should move zpfind_locked() under 'pid <=3D PID_MAX':

	sx_slock(&allproc_lock);
	if (pid <=3D PID_MAX) {
		p =3D pfind_locked(pid);
		if (p =3D=3D NULL && (flags & PGET_NOTWEXIT) =3D=3D 0)
			p =3D zpfind_locked(pid);
	} else if ((flags & PGET_NOTID) =3D=3D 0) {
		p =3D pfind_tid_locked(pid);
	} else {
		p =3D NULL;
	}
	sx_sunlock(&allproc_lock);
	if (p =3D=3D NULL)
		return (ESRCH);

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--6lXr1rPCNTf1w0X8
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlCxSQgACgkQForvXbEpPzQLJQCg6aP44W5Mwm8LbPnOFsKlBeKE
5vsAn3LchhKKzzO1dPpbv3uydJfVpe6P
=pi1E
-----END PGP SIGNATURE-----

--6lXr1rPCNTf1w0X8--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121124222408.GH1460>