X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/cf7d32b81c573a0536dc4da4157f9c26f8d0bed3..316670eb35587141e969394ae8537d66b9211e80:/osfmk/kern/ast.c?ds=sidebyside

diff --git a/osfmk/kern/ast.c b/osfmk/kern/ast.c
index f0b75b59a..9f6757a6b 100644
--- a/osfmk/kern/ast.c
+++ b/osfmk/kern/ast.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2008 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -78,14 +78,22 @@
 #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;
+
 
 void
 ast_init(void)
 {
 }
 
+extern void chudxnu_thread_ast(thread_t); // XXX this should probably be in a header...
+
 /*
  * Called at splsched.
  */
@@ -98,21 +106,21 @@ ast_taken(
 	boolean_t		preempt_trap = (reasons == AST_PREEMPTION);
 	ast_t			*myast = ast_pending();
 	thread_t		thread = current_thread();
+	perfASTCallback	perf_hook = perfASTHook;
 
 	/*
 	 * CHUD hook - all threads including idle processor threads
 	 */
-	if(perfASTHook) {
-		if(*myast & AST_CHUD_ALL) {
-			perfASTHook(0, NULL, 0, 0);
+	if (perf_hook) {
+		if (*myast & AST_CHUD_ALL) {
+			(*perf_hook)(reasons, myast);
 			
-			if(*myast == AST_NONE) {
-				return; // nothing left to do
-			}
+			if (*myast == AST_NONE)
+				return;
 		}
-	} else {
-		*myast &= ~AST_CHUD_ALL;
 	}
+	else
+		*myast &= ~AST_CHUD_ALL;
 
 	reasons &= *myast;
 	*myast &= ~reasons;
@@ -152,26 +160,43 @@ 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);
 
 			/* 
 			 * 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++);
@@ -193,6 +218,7 @@ ast_check(
 	thread_t			thread = processor->active_thread;
 
 	processor->current_pri = thread->sched_pri;
+	processor->current_thmode = thread->sched_mode;
 	if (	processor->state == PROCESSOR_RUNNING		||
 			processor->state == PROCESSOR_SHUTDOWN		) {
 		ast_t			preempt;
@@ -200,12 +226,14 @@ ast_check(
 		/*
 		 *	Propagate thread ast to processor.
 		 */
+		pal_ast_check(thread);
+
 		ast_propagate(thread->ast);
 
 		/*
 		 *	Context switch check.
 		 */
-		if ((preempt = csw_check(thread, processor)) != AST_NONE)
+		if ((preempt = csw_check(processor)) != AST_NONE)
 			ast_on(preempt);
 	}
 }