xnu-1228.9.59.tar.gz

[apple/xnu.git] / osfmk / kern / timer.h

diff --git a/osfmk/kern/timer.h b/osfmk/kern/timer.h
index 190ab8f62e8cb80b361dd21a6a094815d19f8769..9c0fae2883607455f477e6e881fa682a3c7fc93c 100644 (file)
--- a/osfmk/kern/timer.h
+++ b/osfmk/kern/timer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -69,12 +69,12 @@
  */
 
 struct timer {
+#if    !STAT_TIME
+       uint64_t        tstamp;
+#endif /* STAT_TIME */
        uint32_t        low_bits;
        uint32_t        high_bits;
        uint32_t        high_bits_check;
-#if    !STAT_TIME
-       uint32_t        tstamp;
-#endif /* STAT_TIME */
 };
 
 typedef struct timer   timer_data_t, *timer_t;
@@ -87,7 +87,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;                                                                   \
@@ -100,17 +100,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 */
 
@@ -123,6 +141,11 @@ 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
  */
@@ -137,13 +160,4 @@ extern void                timer_update(
                                        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 /* _KERN_TIMER_H_ */