xnu-1504.9.37.tar.gz

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

diff --git a/osfmk/kern/timer.h b/osfmk/kern/timer.h
index 190ab8f62e8cb80b361dd21a6a094815d19f8769..abbfcb5e398e3e5441817079a027f836cbfcde88 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@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -69,12 +69,16 @@
  */
 
 struct timer {
  */
 
 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;
        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;
 };
 
 typedef struct timer   timer_data_t, *timer_t;


@@ -87,7 +91,7 @@ typedef struct timer  timer_data_t, *timer_t;
 
 #include <kern/macro_help.h>
 
 
 #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;                                                                   \
 #define TIMER_BUMP(timer, ticks)                                                               \
 MACRO_BEGIN                                                                                                            \
        uint32_t        old_low, low;                                                                   \


@@ -100,17 +104,35 @@ MACRO_BEGIN                                                                                                               \
                (timer)->low_bits = low;                                                                \
 MACRO_END
 
                (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 */
 
 
 #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(
 extern void            timer_switch(

-                                       uint32_t        tstamp,
+                                       timer_t         timer,
+                                       uint64_t        tstamp,

                                        timer_t         new_timer);
 
                                        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 */
 
 
 #endif /* STAT_TIME */
 


@@ -123,11 +145,23 @@ extern uint64_t   timer_delta(
                                        timer_t         timer,
                                        uint64_t        *save);
 
                                        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 */
 /*
  *     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);
 
 extern uint64_t        timer_grab(
                                        timer_t         timer);
 


@@ -136,14 +170,6 @@ extern void                timer_update(
                                        timer_t         timer,
                                        uint32_t        new_high,
                                        uint32_t        new_low);
                                        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_ */
 
 #endif /* _KERN_TIMER_H_ */