xnu-1456.1.26.tar.gz

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

diff --git a/osfmk/kern/ast.c b/osfmk/kern/ast.c
index 1f7d743f19f7e951afcac1585bdc89518f815e75..b6540f92d7b34d8eb0dd8cee4dc11833eabb8ae2 100644 (file)
--- a/osfmk/kern/ast.c
+++ b/osfmk/kern/ast.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -81,10 +79,8 @@
 #include <kern/spl.h>
 #include <kern/wait_queue.h>
 #include <mach/policy.h>
+#include <machine/trap.h> // for CHUD AST hook
 
-#ifdef __ppc__
-#include <ppc/trap.h> // for CHUD AST hook
-#endif
 
 void
 ast_init(void)
@@ -103,23 +99,21 @@ ast_taken(
        boolean_t               preempt_trap = (reasons == AST_PREEMPTION);
        ast_t                   *myast = ast_pending();
        thread_t                thread = current_thread();
+       perfCallback    perf_hook = perfASTHook;
 
-#ifdef __ppc__
        /*
         * CHUD hook - all threads including idle processor threads
         */
-       if(perfASTHook) {
-               if(*myast & AST_PPC_CHUD_ALL) {
-                       perfASTHook(0, NULL, 0, 0);
+       if (perf_hook) {
+               if (*myast & AST_CHUD_ALL) {
+                       (*perf_hook)(0, NULL, 0, 0);
                        
-                       if(*myast == AST_NONE) {
-                               return; // nothing left to do
-                       }
+                       if (*myast == AST_NONE)
+                               return;
                }
-       } else {
-               *myast &= ~AST_PPC_CHUD_ALL;
        }
-#endif
+       else
+               *myast &= ~AST_CHUD_ALL;
 
        reasons &= *myast;
        *myast &= ~reasons;
@@ -171,14 +165,9 @@ ast_taken(
                        /* 
                         * Check for preemption.
                         */
-                       if (reasons & AST_PREEMPT) {
-                               processor_t             myprocessor = current_processor();
+                       if (reasons & AST_PREEMPT)
+                               reasons = csw_check(current_processor());
 
-                               if (csw_needed(thread, myprocessor))
-                                       reasons = AST_PREEMPT;
-                               else
-                                       reasons = AST_NONE;
-                       }
                        if (    (reasons & AST_PREEMPT)                         &&
                                        wait_queue_assert_possible(thread)              ) {             
                                counter(c_ast_taken_block++);
@@ -197,12 +186,12 @@ void
 ast_check(
        processor_t             processor)
 {
-       register thread_t               thread = processor->active_thread;
+       thread_t                        thread = processor->active_thread;
 
        processor->current_pri = thread->sched_pri;
        if (    processor->state == PROCESSOR_RUNNING           ||
                        processor->state == PROCESSOR_SHUTDOWN          ) {
-               register ast_t          preempt;
+               ast_t                   preempt;
 
                /*
                 *      Propagate thread ast to processor.
@@ -212,7 +201,7 @@ ast_check(
                /*
                 *      Context switch check.
                 */
-               if ((preempt = csw_check(thread, processor)) != AST_NONE)
+               if ((preempt = csw_check(processor)) != AST_NONE)
                        ast_on(preempt);
        }
 }