X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..b0d623f7f2ae71ed96e60569f61f9a9a27016e80:/osfmk/kern/timer.c

diff --git a/osfmk/kern/timer.c b/osfmk/kern/timer.c
index 17a058114..7cce6afe3 100644
--- a/osfmk/kern/timer.c
+++ b/osfmk/kern/timer.c
@@ -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@
  * 
@@ -74,12 +74,16 @@ void
 timer_init(
 	timer_t		timer)
 {
-	timer->low_bits = 0;
-	timer->high_bits = 0;
-	timer->high_bits_check = 0;
 #if	!STAT_TIME
 	timer->tstamp = 0;
 #endif	/* STAT_TIME */
+#if	defined(__LP64__)
+	timer->all_bits = 0;
+#else
+	timer->low_bits = 0;
+	timer->high_bits = 0;
+	timer->high_bits_check = 0;
+#endif	/* defined(__LP64__) */
 }
 
 /*
@@ -98,43 +102,53 @@ timer_delta(
 	return (new - old);
 }
 
+void
+timer_advance(
+	timer_t		timer,
+	uint64_t	delta)
+{
+#if	defined(__LP64__)
+	timer->all_bits += delta;
+#else
+	uint64_t	low;
+
+	low = delta + timer->low_bits;
+	if (low >> 32)
+		timer_update(timer, (uint32_t)(timer->high_bits + (low >> 32)), (uint32_t)low);
+	else
+		timer->low_bits = (uint32_t)low;
+#endif 	/* defined(__LP64__) */
+}
+
 #if	!STAT_TIME
 
+void
+timer_start(
+	timer_t		timer,
+	uint64_t	tstamp)
+{
+	timer->tstamp = tstamp;
+}
+
+void
+timer_stop(
+	timer_t		timer,
+	uint64_t	tstamp)
+{
+	timer_advance(timer, tstamp - timer->tstamp);
+}
+
 /*
- *	Update the current timer (if any)
- *	and start the new timer, which
- *	could be either the same or NULL.
- *
- *	Called with interrupts disabled.
+ *	Update the timer and start a new one.
  */
 void
 timer_switch(
-	uint32_t		tstamp,
+	timer_t			timer,
+	uint64_t		tstamp,
 	timer_t			new_timer)
 {
-	processor_t		processor = current_processor();
-	timer_t			timer;
-	uint32_t		old_low, low;
-
-	/*
-	 *	Update current timer.
-	 */
-	timer = PROCESSOR_DATA(processor, current_timer);
-	if (timer != NULL) {
-		old_low = timer->low_bits;
-		low = old_low + tstamp - timer->tstamp;
-		if (low < old_low)
-			timer_update(timer, timer->high_bits + 1, low);
-		else
-			timer->low_bits = low;
-	}
-
-	/*
-	 *	Start new timer.
-	 */
-	PROCESSOR_DATA(processor, current_timer) = new_timer;
-	if (new_timer != NULL)
-		new_timer->tstamp = tstamp;
+	timer_advance(timer, tstamp - timer->tstamp);
+	new_timer->tstamp = tstamp;
 }
 
 #if	MACHINE_TIMER_ROUTINES
@@ -146,36 +160,30 @@ timer_switch(
 #else	/* MACHINE_TIMER_ROUTINES */
 
 /*
- *	Update the current timer and start
- *	the new timer.  Requires a current
+ *	Update the current thread timer and
+ *	start the new timer.  Requires a current
  *	and new timer.
  *
  *	Called with interrupts disabled.
  */
 void
-timer_event(
-	uint32_t		tstamp,
+thread_timer_event(
+	uint64_t		tstamp,
 	timer_t			new_timer)
 {
 	processor_t		processor = current_processor();
 	timer_t			timer;
-	uint32_t		old_low, low;
 
 	/*
 	 *	Update current timer.
 	 */
-	timer = PROCESSOR_DATA(processor, current_timer);
-	old_low = timer->low_bits;
-	low = old_low + tstamp - timer->tstamp;
-	if (low < old_low)
-		timer_update(timer, timer->high_bits + 1, low);
-	else
-		timer->low_bits = low;
+	timer = PROCESSOR_DATA(processor, thread_timer);
+	timer_advance(timer, tstamp - timer->tstamp);
 
 	/*
 	 *	Start new timer.
 	 */
-	PROCESSOR_DATA(processor, current_timer) = new_timer;
+	PROCESSOR_DATA(processor, thread_timer) = new_timer;
 	new_timer->tstamp = tstamp;
 }