From owner-p4-projects@FreeBSD.ORG  Tue Jan  1 22:53:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B413616A41B; Tue,  1 Jan 2008 22:53:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79FB716A417
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 22:53:01 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 68CEF13C4D9
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 22:53:01 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m01Mr12W061007
	for <perforce@freebsd.org>; Tue, 1 Jan 2008 22:53:01 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m01Mr1El061003
	for perforce@freebsd.org; Tue, 1 Jan 2008 22:53:01 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 1 Jan 2008 22:53:01 GMT
Message-Id: <200801012253.m01Mr1El061003@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132268 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jan 2008 22:53:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=132268

Change 132268 by jb@jb_freebsd1 on 2008/01/01 22:52:36

	Revise the systrace provider:
	- Add a SYSUNINIT
	- Move code from modevent to load/unload
	- Add a dependency on the opensolaris module.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#7 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#7 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * Portions Copyright 2006 John Birrell jb@freebsd.org
+ * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
  * $FreeBSD$
  *
@@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/cpuvar.h>
 #include <sys/fcntl.h>
@@ -58,7 +57,7 @@
 #include <sys/unistd.h>
 #include <machine/stdarg.h>
 
-#include <contrib/opensolaris/uts/common/sys/dtrace_impl.h>
+#include <sys/dtrace.h>
 
 #define	SYSTRACE_ARTIFICIAL_FRAMES	1
 
@@ -232,6 +231,10 @@
 static void
 systrace_load(void *dummy)
 {
+	/* Create the /dev/dtrace/systrace entry. */
+	systrace_cdev = make_dev(&systrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
+	   "dtrace/systrace");
+
 	if (dtrace_register("syscall", &systrace_attr, DTRACE_PRIV_USER,
 	    NULL, &systrace_pops, NULL, &systrace_id) != 0)
 		return;
@@ -263,13 +266,9 @@
 
 	switch (type) {
 	case MOD_LOAD:
-		/* Create the /dev/dtrace/systrace entry. */
-		systrace_cdev = make_dev(&systrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-	 	   "dtrace/systrace");
 		break;
 
 	case MOD_UNLOAD:
-		error = systrace_unload();
 		break;
 
 	case MOD_SHUTDOWN:
@@ -290,8 +289,10 @@
 	return (0);
 }
 
-SYSINIT(systrace_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, systrace_load, NULL)
+SYSINIT(systrace_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, systrace_load, NULL);
+SYSUNINIT(systrace_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, systrace_unload, NULL);
 
 DEV_MODULE(systrace, systrace_modevent, NULL);
 MODULE_VERSION(systrace, 1);
 MODULE_DEPEND(systrace, dtrace, 1, 1, 1);
+MODULE_DEPEND(systrace, opensolaris, 1, 1, 1);