From owner-p4-projects@FreeBSD.ORG  Fri Dec 21 23:59:08 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BCE916A420; Fri, 21 Dec 2007 23:59:08 +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 936D616A41B
	for <perforce@freebsd.org>; Fri, 21 Dec 2007 23:59:07 +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 6F37E13C455
	for <perforce@freebsd.org>; Fri, 21 Dec 2007 23:59:07 +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 lBLNx2sl046152
	for <perforce@freebsd.org>; Fri, 21 Dec 2007 23:59:07 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBLNx2tr046149
	for perforce@freebsd.org; Fri, 21 Dec 2007 23:59:02 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 21 Dec 2007 23:59:02 GMT
Message-Id: <200712212359.lBLNx2tr046149@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 131395 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: Fri, 21 Dec 2007 23:59:08 -0000

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

Change 131395 by jb@jb_freebsd1 on 2007/12/21 23:58:22

	Move a couple of function prototypes into a DTrace-specfic header
	so that they aren't visible to others. The functions are
	machine-specific and are only present if the KDTRACE_HOOKS
	kernel option is enabled.

Affected files ...

.. //depot/projects/dtrace/src/sys/sys/dtrace_bsd.h#5 edit
.. //depot/projects/dtrace/src/sys/sys/time.h#13 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sys/dtrace_bsd.h#5 (text+ko) ====

@@ -58,4 +58,11 @@
 size_t	kdtrace_proc_size(void);
 size_t	kdtrace_thread_size(void);
 
+/*
+ * OpenSolaris compatible time functions returning nanoseconds.
+ * On OpenSolaris these return hrtime_t which we define as uint64_t.
+ */
+uint64_t	dtrace_gethrtime(void);
+uint64_t	dtrace_gethrestime(void);
+
 #endif /* _SYS_DTRACE_BSD_H */

==== //depot/projects/dtrace/src/sys/sys/time.h#13 (text+ko) ====

@@ -304,8 +304,6 @@
 void	timevaladd(struct timeval *t1, const struct timeval *t2);
 void	timevalsub(struct timeval *t1, const struct timeval *t2);
 int	tvtohz(struct timeval *tv);
-uint64_t	dtrace_gethrtime(void);
-uint64_t	dtrace_gethrestime(void);
 #else /* !_KERNEL */
 #include <time.h>