From owner-svn-src-all@FreeBSD.ORG Sat May 7 12:41:31 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A882106566B; Sat, 7 May 2011 12:41:31 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id E67058FC08; Sat, 7 May 2011 12:41:30 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p47CfR49064018 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 7 May 2011 15:41:27 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p47CfRiR002839; Sat, 7 May 2011 15:41:27 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p47CfRuY002838; Sat, 7 May 2011 15:41:27 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 7 May 2011 15:41:27 +0300 From: Kostik Belousov To: Jaakko Heinonen Message-ID: <20110507124127.GP48734@deviant.kiev.zoral.com.ua> References: <201105071110.p47BAwmU096094@svn.freebsd.org> <20110507114856.GN48734@deviant.kiev.zoral.com.ua> <20110507122048.GA1846@a91-153-123-205.elisa-laajakaista.fi> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ExLobwx2ErZCZZ6w" Content-Disposition: inline In-Reply-To: <20110507122048.GA1846@a91-153-123-205.elisa-laajakaista.fi> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r221597 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2011 12:41:31 -0000 --ExLobwx2ErZCZZ6w Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, May 07, 2011 at 03:20:48PM +0300, Jaakko Heinonen wrote: > On 2011-05-07, Kostik Belousov wrote: > > > @@ -310,6 +310,7 @@ getenv(const char *name) > > > int len; > > > =20 > > > if (dynamic_kenv) { > > > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "getenv"); > > > mtx_lock(&kenv_lock); > > > cp =3D _getenv_dynamic(name, NULL); > > > if (cp !=3D NULL) { > >=20 > > This might be somewhat excessive. Since malloc() warns or panics anyway, > > what about moving the WITNESS_WARN into "not found" branch ? >=20 > Is this better? Most likely, at least this is exactly what I meant. >=20 > %%% > Index: sys/kern/kern_environment.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- sys/kern/kern_environment.c (revision 221597) > +++ sys/kern/kern_environment.c (working copy) > @@ -310,7 +310,6 @@ getenv(const char *name) > int len; > =20 > if (dynamic_kenv) { > - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "getenv"); > mtx_lock(&kenv_lock); > cp =3D _getenv_dynamic(name, NULL); > if (cp !=3D NULL) { > @@ -322,6 +321,8 @@ getenv(const char *name) > } else { > mtx_unlock(&kenv_lock); > ret =3D NULL; > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, > + "getenv"); > } > } else > ret =3D _getenv_static(name); > %%% >=20 > --=20 > Jaakko --ExLobwx2ErZCZZ6w Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk3FPfcACgkQC3+MBN1Mb4itqgCgji+tg0Ghytbr7QggkpqKFmPP HC4AnjMTMUq6lLF7yg8i1QpIeLDzsz19 =2pTf -----END PGP SIGNATURE----- --ExLobwx2ErZCZZ6w--