xnu-517.tar.gz

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

diff --git a/osfmk/kern/mach_clock.c b/osfmk/kern/mach_clock.c
index b7c7d8835afd1ff92f665e5128b3718ba3b92d87..accc3fe3d6dd80ec85183fa629ea8d27b312c333 100644 (file)
--- a/osfmk/kern/mach_clock.c
+++ b/osfmk/kern/mach_clock.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE 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_LICENSE_HEADER_END@
  */
@@ -161,11 +164,9 @@ hertz_tick(
 
        if (usermode) {
                TICKBUMP(&thread->user_timer);
-#if 0
                if (thread->priority < BASEPRI_DEFAULT)
                        state = CPU_STATE_NICE;
                else
-#endif
                        state = CPU_STATE_USER;
 #if GPROF
                        if (pv->active)
@@ -173,18 +174,14 @@ hertz_tick(
 #endif
        }
        else {
-               switch(processor_ptr[my_cpu]->state) {
+               TICKBUMP(&thread->system_timer);
 
-               case PROCESSOR_IDLE:
-                       TICKBUMP(&thread->system_timer);
+               state = processor_ptr[my_cpu]->state;
+               if (    state == PROCESSOR_IDLE                 ||
+                               state == PROCESSOR_DISPATCHING  )
                        state = CPU_STATE_IDLE;
-                       break;
-
-               default:
-                       TICKBUMP(&thread->system_timer);
+               else
                        state = CPU_STATE_SYSTEM;
-                       break;
-               }
 #if GPROF
                if (pv->active) {
                        if (state == CPU_STATE_SYSTEM)