From owner-p4-projects@FreeBSD.ORG  Wed Apr 19 19:58:18 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 14D3816A407; Wed, 19 Apr 2006 19:58:18 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E77EB16A405
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 19:58:17 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B2A8243D49
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 19:58:17 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3JJwHBB083227
	for <perforce@freebsd.org>; Wed, 19 Apr 2006 19:58:17 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JJwHMM083220
	for perforce@freebsd.org; Wed, 19 Apr 2006 19:58:17 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 19 Apr 2006 19:58:17 GMT
Message-Id: <200604191958.k3JJwHMM083220@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 95616 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: Wed, 19 Apr 2006 19:58:18 -0000

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

Change 95616 by jb@jb_freebsd2 on 2006/04/19 19:58:07

	Implement the load initialisation and unload cleanup in separate
	functions because there are quite a few things to do.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#4 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#1 add
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#2 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 add

Differences ...

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

@@ -50,9 +50,11 @@
 
 #define DTRACE_MINOR	0
 
-static d_close_t dtrace_close;
-static d_ioctl_t dtrace_ioctl;
-static d_open_t dtrace_open;
+static d_close_t	dtrace_close;
+static d_ioctl_t	dtrace_ioctl;
+static d_open_t		dtrace_open;
+static int		dtrace_load(void);
+static int		dtrace_unload(void);
 
 static struct cdevsw dtrace_cdevsw = {
 	.d_version = D_VERSION,
@@ -65,11 +67,13 @@
 /* For use with make_dev(9)/destroy_dev(9). */
 static struct cdev *dtrace_dev;
 
-#include <cddl/dev/dtrace/dtrace_sysctl.c>
 #include <cddl/dev/dtrace/dtrace_close.c>
+#include <cddl/dev/dtrace/dtrace_ioctl.c>
+#include <cddl/dev/dtrace/dtrace_load.c>
 #include <cddl/dev/dtrace/dtrace_modevent.c>
 #include <cddl/dev/dtrace/dtrace_open.c>
-#include <cddl/dev/dtrace/dtrace_ioctl.c>
+#include <cddl/dev/dtrace/dtrace_sysctl.c>
+#include <cddl/dev/dtrace/dtrace_unload.c>
 
 DEV_MODULE(dtrace, dtrace_modevent, NULL);
 MODULE_VERSION(dtrace, 1);

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

@@ -30,12 +30,11 @@
 
 	switch (type) {
 	case MOD_LOAD:
-		dtrace_dev = make_dev(&dtrace_cdevsw, DTRACE_MINOR,
-		    UID_ROOT, GID_WHEEL, 0660, "dtrace");
+		error = dtrace_load();
 		break;
 
 	case MOD_UNLOAD:
-		destroy_dev(dtrace_dev);
+		error = dtrace_unload();
 		break;
 
 	case MOD_SHUTDOWN: