xnu-6153.81.5.tar.gz

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

diff --git a/osfmk/kern/timer.c b/osfmk/kern/timer.c
index b53419857ecfce18f4624962c99013e84d818974..4be4464cba479ba4f5c35f57e7751738ba4244e3 100644 (file)
--- a/osfmk/kern/timer.c
+++ b/osfmk/kern/timer.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2018 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,42 +22,37 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */

-/* 
- */
-
-#include <stat_time.h>
-#include <machine_timer_routines.h>

 
 #include <mach/kern_return.h>
 #include <mach/port.h>
 
 #include <mach/kern_return.h>
 #include <mach/port.h>


@@ -67,118 +62,87 @@
 #include <kern/sched_prim.h>
 #include <kern/timer.h>
 
 #include <kern/sched_prim.h>
 #include <kern/timer.h>
 

-/*
- *     timer_init initializes a timer.
- */
+#if CONFIG_EMBEDDED
+int precise_user_kernel_time = 0;
+#else
+int precise_user_kernel_time = 1;
+#endif
+

 void
 void

-timer_init(
-       timer_t         timer)
+timer_init(timer_t timer)

 {
 {

-#if    !STAT_TIME
-       timer->tstamp = 0;
-#endif /* STAT_TIME */
-       timer->low_bits = 0;
-       timer->high_bits = 0;
-       timer->high_bits_check = 0;
+       memset(timer, 0, sizeof(*timer));

 }
 
 }
 

-/*
- *     Calculate the difference between a timer
- *     and saved value, and update the saved value.
- */

 uint64_t
 uint64_t

-timer_delta(
-       timer_t         timer,
-       uint64_t        *save)
+timer_delta(timer_t timer, uint64_t *prev_in_cur_out)

 {
 {

-       uint64_t        new, old = *save;
-
-       *save = new = timer_grab(timer);
+       uint64_t old = *prev_in_cur_out;
+       uint64_t new = *prev_in_cur_out = timer_grab(timer);
+       return new - old;
+}

 
 

-       return (new - old);
+static void
+timer_advance(timer_t timer, uint64_t delta)
+{
+#if defined(__LP64__)
+       timer->all_bits += delta;
+#else /* defined(__LP64__) */
+       extern void timer_advance_internal_32(timer_t timer, uint32_t high,
+           uint32_t low);
+       uint64_t low = delta + timer->low_bits;
+       if (low >> 32) {
+               timer_advance_internal_32(timer,
+                   (uint32_t)(timer->high_bits + (low >> 32)), (uint32_t)low);
+       } else {
+               timer->low_bits = (uint32_t)low;
+       }
+#endif /* defined(__LP64__) */

 }
 
 void
 }
 
 void

-timer_advance(
-       timer_t         timer,
-       uint64_t        delta)
+timer_start(timer_t timer, uint64_t tstamp)

 {
 {

-       uint64_t        low;
-
-       low = delta + timer->low_bits;
-       if (low >> 32)
-               timer_update(timer, timer->high_bits + (low >> 32), low);
-       else
-               timer->low_bits = low;
+       timer->tstamp = tstamp;

 }
 
 }
 

-#if    !STAT_TIME
-

 void
 void

-timer_start(
-       timer_t         timer,
-       uint64_t        tstamp)
+timer_stop(timer_t timer, uint64_t tstamp)

 {
 {

-       timer->tstamp = tstamp;
+       timer_advance(timer, tstamp - timer->tstamp);

 }
 
 void
 }
 
 void

-timer_stop(
-       timer_t         timer,
-       uint64_t        tstamp)
+timer_update(timer_t timer, uint64_t tstamp)

 {
        timer_advance(timer, tstamp - timer->tstamp);
 {
        timer_advance(timer, tstamp - timer->tstamp);

+       timer->tstamp = tstamp;

 }
 
 }
 

-/*
- *     Update the timer and start a new one.
- */

 void
 void

-timer_switch(
-       timer_t                 timer,
-       uint64_t                tstamp,
-       timer_t                 new_timer)
+timer_switch(timer_t timer, uint64_t tstamp, timer_t new_timer)

 {
        timer_advance(timer, tstamp - timer->tstamp);
        new_timer->tstamp = tstamp;
 }
 
 {
        timer_advance(timer, tstamp - timer->tstamp);
        new_timer->tstamp = tstamp;
 }
 

-#if    MACHINE_TIMER_ROUTINES
-
-/*
- *     Machine-dependent code implements the timer event routine.
- */
-
-#else  /* MACHINE_TIMER_ROUTINES */
-

 /*
 /*

- *     Update the current thread timer and
- *     start the new timer.  Requires a current
- *     and new timer.
+ * Update the current processor's thread timer with `tstamp` and switch the
+ * processor's thread timer to `new_timer`.

  *
  *

- *     Called with interrupts disabled.
+ * Called with interrupts disabled.

  */
 void
  */
 void

-thread_timer_event(
-       uint64_t                tstamp,
-       timer_t                 new_timer)
+processor_timer_switch_thread(uint64_t tstamp, timer_t new_timer)

 {
 {

-       processor_t             processor = current_processor();
-       timer_t                 timer;
+       processor_t processor = current_processor();
+       timer_t timer;

 
 

-       /*
-        *      Update current timer.
-        */
+       /* Update current timer. */

        timer = PROCESSOR_DATA(processor, thread_timer);
        timer_advance(timer, tstamp - timer->tstamp);
 
        timer = PROCESSOR_DATA(processor, thread_timer);
        timer_advance(timer, tstamp - timer->tstamp);
 

-       /*
-        *      Start new timer.
-        */
+       /* Start new timer. */

        PROCESSOR_DATA(processor, thread_timer) = new_timer;
        new_timer->tstamp = tstamp;
 }
        PROCESSOR_DATA(processor, thread_timer) = new_timer;
        new_timer->tstamp = tstamp;
 }

-
-#endif /* MACHINE_TIMER_ROUTINES */
-
-#endif /* STAT_TIME */