From owner-p4-projects@FreeBSD.ORG  Tue Jun 20 06:05:33 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 62E2316A47B; Tue, 20 Jun 2006 06:05:33 +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 3CE4616A474
	for <perforce@freebsd.org>; Tue, 20 Jun 2006 06:05:33 +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 0BC2C43D45
	for <perforce@freebsd.org>; Tue, 20 Jun 2006 06:05:33 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5K65WQS074334
	for <perforce@freebsd.org>; Tue, 20 Jun 2006 06:05:32 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5K65WBJ074331
	for perforce@freebsd.org; Tue, 20 Jun 2006 06:05:32 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 20 Jun 2006 06:05:32 GMT
Message-Id: <200606200605.k5K65WBJ074331@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 99659 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, 20 Jun 2006 06:05:33 -0000

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

Change 99659 by jb@jb_freebsd2 on 2006/06/20 06:04:45

	Register and de-register the thread switch callback function for vtime.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#13 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#12 edit

Differences ...

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

@@ -38,6 +38,9 @@
 	/* Hang our hook for DTrace traps during probes. */
 	dtrace_instr_size_func = dtrace_instr_size;
 
+	/* Hang our hook for thread switches. */
+	dtrace_vtime_switch_func = dtrace_vtime_switch;
+
 	/*
 	 * XXX This is a short term hack to avoid having to comment
 	 * out lots and lots of lock/unlock calls.

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

@@ -154,6 +154,13 @@
 	dtrace_mutex_destroy(&cpu_lock);
 	dtrace_mutex_destroy(&mod_lock);
 
+	/*
+	 * Reset our hook for thread switches, but ensure that vtime isn't
+	 * active first.
+	 */
+	dtrace_vtime_active = 0;
+	dtrace_vtime_switch_func = NULL;
+
 	/* Reset our hook for DTrace traps during probes. */
 	dtrace_instr_size_func = NULL;