xnu-2050.7.9.tar.gz

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

diff --git a/osfmk/kern/ast.c b/osfmk/kern/ast.c
index e7b895598ecbaf01560420bece5f61b29d5e2e37..9f6757a6bd1335517c83f750ee26fadbc22dc951 100644 (file)
--- a/osfmk/kern/ast.c
+++ b/osfmk/kern/ast.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -78,10 +78,11 @@
 #include <kern/processor.h>
 #include <kern/spl.h>
 #include <kern/wait_queue.h>
+#include <kern/ledger.h>
 #include <mach/policy.h>
 #include <machine/trap.h> // for CHUD AST hook
 #include <machine/pal_routines.h>
-
+#include <security/mac_mach_internal.h> // for MACF AST hook
 
 volatile perfASTCallback perfASTHook;
 
@@ -91,6 +92,8 @@ ast_init(void)
 {
 }
 
+extern void chudxnu_thread_ast(thread_t); // XXX this should probably be in a header...
+
 /*
  * Called at splsched.
  */
@@ -157,13 +160,35 @@ ast_taken(
                                bsd_ast(thread);
                        }
 #endif
-
+#if CONFIG_MACF
+                       /*
+                        * Handle MACF hook.
+                        */
+                       if (reasons & AST_MACF) {
+                               thread_ast_clear(thread, AST_MACF);
+                               mac_thread_userret(thread);
+                       }
+#endif
                        /* 
                         * Thread APC hook.
                         */
                        if (reasons & AST_APC)
                                act_execute_returnhandlers();
 
+                       if (reasons & AST_LEDGER) {
+                               thread_ast_clear(thread, AST_LEDGER);
+                               ledger_ast(thread);
+                       }
+
+                       /*
+                        * Kernel Profiling Hook
+                        */
+                       if (reasons & AST_KPERF)
+                       {
+                               thread_ast_clear(thread, AST_KPERF);
+                               chudxnu_thread_ast(thread);
+                       }
+
                        ml_set_interrupts_enabled(FALSE);
 
                        /*