From owner-svn-src-stable-8@FreeBSD.ORG Tue Jul 16 11:54:26 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5B34353A; Tue, 16 Jul 2013 11:54:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4CF30D1; Tue, 16 Jul 2013 11:54:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6GBsPho025457; Tue, 16 Jul 2013 11:54:25 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6GBsP1q025456; Tue, 16 Jul 2013 11:54:25 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201307161154.r6GBsP1q025456@svn.freebsd.org> From: Andriy Gapon Date: Tue, 16 Jul 2013 11:54:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253389 - stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2013 11:54:26 -0000 Author: avg Date: Tue Jul 16 11:54:25 2013 New Revision: 253389 URL: http://svnweb.freebsd.org/changeset/base/253389 Log: MFC r253079: dtrace/fasttrap: install hook functions only after all data is initialized Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Tue Jul 16 11:15:05 2013 (r253388) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Tue Jul 16 11:54:25 2013 (r253389) @@ -2274,13 +2274,6 @@ fasttrap_load(void) mutex_init(&fasttrap_count_mtx, "fasttrap count mtx", MUTEX_DEFAULT, NULL); - /* - * Install our hooks into fork(2), exec(2), and exit(2). - */ - dtrace_fasttrap_fork = &fasttrap_fork; - dtrace_fasttrap_exit = &fasttrap_exec_exit; - dtrace_fasttrap_exec = &fasttrap_exec_exit; - #if defined(sun) fasttrap_max = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "fasttrap-max-probes", FASTTRAP_MAX_DEFAULT); @@ -2357,6 +2350,13 @@ fasttrap_load(void) } #endif + /* + * Install our hooks into fork(2), exec(2), and exit(2). + */ + dtrace_fasttrap_fork = &fasttrap_fork; + dtrace_fasttrap_exit = &fasttrap_exec_exit; + dtrace_fasttrap_exec = &fasttrap_exec_exit; + (void) dtrace_meta_register("fasttrap", &fasttrap_mops, NULL, &fasttrap_meta_id);