X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/osfmk/kern/timer.h

diff --git a/osfmk/kern/timer.h b/osfmk/kern/timer.h
index d243563af..abbfcb5e3 100644
--- a/osfmk/kern/timer.h
+++ b/osfmk/kern/timer.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -64,12 +69,16 @@
  */
 
 struct timer {
+#if	!STAT_TIME
+	uint64_t	tstamp;
+#endif	/* STAT_TIME */
+#if	defined(__LP64__)
+	uint64_t	all_bits;
+#else
 	uint32_t	low_bits;
 	uint32_t	high_bits;
 	uint32_t	high_bits_check;
-#if	!STAT_TIME
-	uint32_t	tstamp;
-#endif	/* STAT_TIME */
+#endif
 };
 
 typedef struct timer	timer_data_t, *timer_t;
@@ -82,7 +91,7 @@ typedef struct timer	timer_data_t, *timer_t;
 
 #include <kern/macro_help.h>
 
-/* Advance a timer by the specified amount */
+/* Advance a timer by a 32 bit value */
 #define TIMER_BUMP(timer, ticks)								\
 MACRO_BEGIN														\
 	uint32_t	old_low, low;									\
@@ -95,17 +104,35 @@ MACRO_BEGIN														\
 		(timer)->low_bits = low;								\
 MACRO_END
 
-#define timer_switch(tstamp, new_timer)
-#define timer_event(tstamp, new_timer)
+#define timer_start(timer, tstamp)
+#define timer_stop(timer, tstamp)
+#define timer_switch(timer, tstamp, new_timer)
+#define thread_timer_event(tstamp, new_timer)
 
 #else	/* STAT_TIME */
 
-/* Update the current timer and start a new one */
+#define	TIMER_BUMP(timer, ticks)
+
+/* Start a timer by setting the timestamp */
+extern void		timer_start(
+					timer_t		timer,
+					uint64_t	tstamp);
+
+/* Stop a timer by updating from the timestamp */
+extern void		timer_stop(
+					timer_t		timer,
+					uint64_t	tstamp);
+
+/* Update the timer and start a new one */
 extern void		timer_switch(
-					uint32_t	tstamp,
+					timer_t		timer,
+					uint64_t	tstamp,
 					timer_t		new_timer);
 
-#define	TIMER_BUMP(timer, ticks)
+/* Update the thread timer at an event */
+extern void		thread_timer_event(
+					uint64_t	tstamp,
+					timer_t		new_timer);
 
 #endif	/* STAT_TIME */
 
@@ -118,11 +145,23 @@ extern uint64_t	timer_delta(
 					timer_t		timer,
 					uint64_t	*save);
 
+/* Advance a timer by a 64 bit value */
+extern void		timer_advance(
+					timer_t		timer,
+					uint64_t	delta);
+
 /*
  *	Exported hardware interface to timers
  */
 
 /* Read timer value */
+#if	defined(__LP64__)
+static inline uint64_t timer_grab(
+					timer_t		timer)
+{
+	return timer->all_bits;
+}
+#else
 extern uint64_t	timer_grab(
 					timer_t		timer);
 
@@ -131,14 +170,6 @@ extern void		timer_update(
 					timer_t		timer,
 					uint32_t	new_high,
 					uint32_t	new_low);
-
-#if	!STAT_TIME
-
-/* Update the current timer at an event */
-extern void		timer_event(
-					uint32_t	tstamp,
-					timer_t		new_timer);
-
-#endif	/* STAT_TIME */
+#endif	/* defined(__LP64__) */
 
 #endif	/* _KERN_TIMER_H_ */