From owner-p4-projects@FreeBSD.ORG  Sun Apr 23 20:39:53 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 7BA8A16A40B; Sun, 23 Apr 2006 20:39:53 +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 3986F16A408
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 20:39:53 +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 0722843D46
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 20:39:53 +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 k3NKdqHQ057846
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 20:39:52 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3NKdqvq057837
	for perforce@freebsd.org; Sun, 23 Apr 2006 20:39:52 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 23 Apr 2006 20:39:52 GMT
Message-Id: <200604232039.k3NKdqvq057837@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 95947 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: Sun, 23 Apr 2006 20:39:53 -0000

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

Change 95947 by jb@jb_freebsd2 on 2006/04/23 20:39:34

	Go back to just using the /dev/dtrace device name and clone from
	that name explicitly.
	
	Add a (temporary) debug flag for the device flags so that I can
	sort out what each device is doing in the kernel.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#8 edit
.. //depot/projects/dtrace/src/sys/sys/fcntl.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#8 (text) ====

@@ -922,7 +922,7 @@
 #if defined(sun)
 	dtfd = open("/dev/dtrace/dtrace", O_RDWR);
 #else
-	dtfd = open("/dev/dtrace0", O_RDWR);
+	dtfd = open("/dev/dtrace", O_RDWR | O_DEBUG);
 #endif
 	err = errno; /* save errno from opening dtfd */
 

==== //depot/projects/dtrace/src/sys/sys/fcntl.h#2 (text+ko) ====

@@ -113,6 +113,7 @@
 /* Attempt to bypass buffer cache */
 #define O_DIRECT	0x00010000
 #endif
+#define	O_DEBUG		0x00020000
 
 /*
  * XXX missing O_DSYNC, O_RSYNC.