From owner-p4-projects@FreeBSD.ORG  Mon Apr 24 23:42:56 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 C375916A404; Mon, 24 Apr 2006 23:42:56 +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 97E6316A400
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:42:56 +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 63F3B43D4C
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:42:56 +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 k3ONgu8Y011966
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:42:56 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ONguSw011958
	for perforce@freebsd.org; Mon, 24 Apr 2006 23:42:56 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 24 Apr 2006 23:42:56 GMT
Message-Id: <200604242342.k3ONguSw011958@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 96034 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: Mon, 24 Apr 2006 23:42:57 -0000

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

Change 96034 by jb@jb_freebsd2 on 2006/04/24 23:42:49

	Add the DTrace specific fields to 'struct thread'.

Affected files ...

.. //depot/projects/dtrace/src/sys/sys/proc.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sys/proc.h#3 (text+ko) ====

@@ -331,6 +331,44 @@
 	struct mdthread td_md;		/* (k) Any machine-dependent fields. */
 	struct td_sched	*td_sched;	/* (*) Scheduler-specific data. */
 	struct kaudit_record	*td_ar;	/* (k) Active audit record, if any. */
+
+/* Start of DTrace-specific fields. */
+	u_int		td_predcache;	/* DTrace predicate cache */
+	u_int64_t	td_dtrace_vtime;
+					/* DTrace virtual time */
+	u_int64_t	td_dtrace_start;
+					/* DTrace slice start time */
+
+	u_int8_t	td_dtrace_stop;	/* Indicates a DTrace-desired stop */
+	u_int8_t	td_dtrace_sig;	/* Signal sent via DTrace's raise() */
+
+	union __tdu {
+		struct __tds {
+			u_int8_t	_td_dtrace_on;
+					/* Hit a fasttrap tracepoint. */
+			u_int8_t	_td_dtrace_step;
+					/* About to return to kernel. */
+			u_int8_t	_td_dtrace_ret;
+					/* Handling a return probe. */
+			u_int8_t	_td_dtrace_ast;
+					/* Saved ast flag. */
+		} _tds;
+		u_long	_td_dtrace_ft;	/* Bitwise or of these flags. */
+	} _tdu;
+#define	td_dtrace_ft	_tdu._td_dtrace_ft
+#define	td_dtrace_on	_tdu._tds._td_dtrace_on
+#define	td_dtrace_step	_tdu._tds._td_dtrace_step
+#define	td_dtrace_ret	_tdu._tds._td_dtrace_ret
+#define	td_dtrace_ast	_tdu._tds._td_dtrace_ast
+
+	uintptr_t	td_dtrace_pc;	/* DTrace saved pc from fasttrap. */
+	uintptr_t	td_dtrace_npc;	/* DTrace next pc from fasttrap. */
+	uintptr_t	td_dtrace_scrpc;
+					/* DTrace per-thread scratch location. */
+	uintptr_t	td_dtrace_astpc;
+					/* DTrace return sequence location. */
+	u_int64_t	td_hrtime;	/* Last time on cpu. */
+/* End of DTrace-specific fields. */
 };
 
 /*