From owner-svn-src-all@FreeBSD.ORG Mon Dec 12 17:15:43 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 5FDF31065677; Mon, 12 Dec 2011 17:15:43 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 2A94F8FC12; Mon, 12 Dec 2011 17:15:41 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id TAA25763; Mon, 12 Dec 2011 19:15:40 +0200 (EET) (envelope-from avg@FreeBSD.org) Message-ID: <4EE636BB.7050008@FreeBSD.org> Date: Mon, 12 Dec 2011 19:15:39 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:8.0) Gecko/20111109 Thunderbird/8.0 MIME-Version: 1.0 To: Attilio Rao References: <201112121005.pBCA5Dar093711@svn.freebsd.org> <20111212101558.GK50300@deviant.kiev.zoral.com.ua> <4EE5D574.9080303@FreeBSD.org> In-Reply-To: X-Enigmail-Version: undefined Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: Kostik Belousov , svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r228433 - in head/sys: kern security/mac 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: Mon, 12 Dec 2011 17:15:43 -0000 on 12/12/2011 19:05 Attilio Rao said the following: > More precisely, what do you think about the patch below? > I just didn't revert the moving of systm.h under param.h because Bruce > seems to prefer that. > > I'm starting test-compile right now, let me know your preference. The patch looks good to me. > Index: sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c > =================================================================== > --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c > (revision 228438) > +++ sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c (working copy) > @@ -5877,6 +5877,9 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintp > volatile uint16_t *flags; > hrtime_t now; > > + if (SCHEDULER_STOPPED()) > + return; > + I think that this could even be "panicstr != NULL", there is probably no use for DTrace at panic time. > #if defined(sun) > /* > * Kick out immediately if this CPU is still being born (in which case > Index: sys/security/mac/mac_priv.c > =================================================================== > --- sys/security/mac/mac_priv.c (revision 228438) > +++ sys/security/mac/mac_priv.c (working copy) > @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); > #include "opt_mac.h" > > #include > -#include > #include > #include > #include I would even keep this inclusion, just for the "why not" reason. > Index: sys/sys/lockstat.h > =================================================================== > --- sys/sys/lockstat.h (revision 228438) > +++ sys/sys/lockstat.h (working copy) > @@ -185,24 +185,17 @@ extern uint64_t lockstat_nsecs(void); > #define LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(probe, lp, c, wt, > f, l) do { \ > uint32_t id; \ > \ > - if (!SCHEDULER_STOPPED()) { \ > - lock_profile_obtain_lock_success(&(lp)->lock_object, c, wt, \ > - f, l); \ > - if ((id = lockstat_probemap[(probe)])) \ > - (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, \ > - 0, 0); \ > - } \ > + lock_profile_obtain_lock_success(&(lp)->lock_object, c, wt, f, l); \ > + if ((id = lockstat_probemap[(probe)])) \ > + (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, 0, 0); \ > } while (0) > > #define LOCKSTAT_PROFILE_RELEASE_LOCK(probe, lp) do { > \ > uint32_t id; \ > \ > - if (!SCHEDULER_STOPPED()) { \ > - lock_profile_release_lock(&(lp)->lock_object); \ > - if ((id = lockstat_probemap[(probe)])) \ > - (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, \ > - 0, 0); \ > - } \ > + lock_profile_release_lock(&(lp)->lock_object); \ > + if ((id = lockstat_probemap[(probe)])) \ > + (*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, 0, 0); \ > } while (0) > > #else /* !KDTRACE_HOOKS */ -- Andriy Gapon