X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..4452a7af2eac33dbad800bcc91f2399d62c18f53:/osfmk/kern/ast.c

diff --git a/osfmk/kern/ast.c b/osfmk/kern/ast.c
index 9ed7fd91f..d8ac52a86 100644
--- a/osfmk/kern/ast.c
+++ b/osfmk/kern/ast.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -63,7 +66,6 @@
  */
 
 #include <cputypes.h>
-#include <cpus.h>
 #include <platforms.h>
 
 #include <kern/ast.h>
@@ -73,24 +75,15 @@
 #include <kern/queue.h>
 #include <kern/sched_prim.h>
 #include <kern/thread.h>
-#include <kern/thread_act.h>
-#include <kern/thread_swap.h>
 #include <kern/processor.h>
 #include <kern/spl.h>
+#include <kern/wait_queue.h>
 #include <mach/policy.h>
-
-volatile ast_t need_ast[NCPUS];
+#include <machine/trap.h> // for CHUD AST hook
 
 void
 ast_init(void)
 {
-#ifndef	MACHINE_AST
-	register int i;
-
-	for (i=0; i<NCPUS; i++) {
-		need_ast[i] = AST_NONE;
-	}
-#endif	/* MACHINE_AST */
 }
 
 /*
@@ -98,30 +91,45 @@ ast_init(void)
  */
 void
 ast_taken(
-	ast_t			reasons,
-	boolean_t		enable
+	ast_t		reasons,
+	boolean_t	enable
 )
 {
-	register thread_t		self = current_thread();
-	register int			mycpu = cpu_number();
-	boolean_t				preempt_trap = (reasons == AST_PREEMPTION);
+	boolean_t		preempt_trap = (reasons == AST_PREEMPTION);
+	ast_t			*myast = ast_pending();
+	thread_t		thread = current_thread();
 
-	reasons &= need_ast[mycpu];
-	need_ast[mycpu] &= ~reasons;
+	/*
+	 * CHUD hook - all threads including idle processor threads
+	 */
+	if(perfASTHook) {
+		if(*myast & AST_CHUD_ALL) {
+			perfASTHook(0, NULL, 0, 0);
+			
+			if(*myast == AST_NONE) {
+				return; // nothing left to do
+			}
+		}
+	} else {
+		*myast &= ~AST_CHUD_ALL;
+	}
+
+	reasons &= *myast;
+	*myast &= ~reasons;
 
 	/*
 	 * Handle ASTs for all threads
 	 * except idle processor threads.
 	 */
-	if (!(self->state & TH_IDLE)) {
+	if (!(thread->state & TH_IDLE)) {
 		/*
 		 * Check for urgent preemption.
 		 */
 		if (	(reasons & AST_URGENT)				&&
-				wait_queue_assert_possible(self)		) {
+				wait_queue_assert_possible(thread)		) {
 			if (reasons & AST_PREEMPT) {
 				counter(c_ast_taken_block++);
-				thread_block_reason(THREAD_CONTINUE_NULL,
+				thread_block_reason(THREAD_CONTINUE_NULL, NULL,
 										AST_PREEMPT | AST_URGENT);
 			}
 
@@ -140,11 +148,8 @@ ast_taken(
 			 * Handle BSD hook.
 			 */
 			if (reasons & AST_BSD) {
-				extern void		bsd_ast(thread_act_t	act);
-				thread_act_t	act = self->top_act;
-
-				thread_ast_clear(act, AST_BSD);
-				bsd_ast(act);
+				thread_ast_clear(thread, AST_BSD);
+				bsd_ast(thread);
 			}
 #endif
 
@@ -162,15 +167,15 @@ ast_taken(
 			if (reasons & AST_PREEMPT) {
 				processor_t		myprocessor = current_processor();
 
-				if (csw_needed(self, myprocessor))
+				if (csw_needed(thread, myprocessor))
 					reasons = AST_PREEMPT;
 				else
 					reasons = AST_NONE;
 			}
 			if (	(reasons & AST_PREEMPT)				&&
-					wait_queue_assert_possible(self)		) {		
+					wait_queue_assert_possible(thread)		) {		
 				counter(c_ast_taken_block++);
-				thread_block_reason(thread_exception_return, AST_PREEMPT);
+				thread_block_reason((thread_continue_t)thread_exception_return, NULL, AST_PREEMPT);
 			}
 		}
 	}
@@ -185,30 +190,22 @@ void
 ast_check(
 	processor_t		processor)
 {
-	register thread_t		self = processor->active_thread;
+	register thread_t		thread = processor->active_thread;
 
-	processor->current_pri = self->sched_pri;
-	if (processor->state == PROCESSOR_RUNNING) {
+	processor->current_pri = thread->sched_pri;
+	if (	processor->state == PROCESSOR_RUNNING		||
+			processor->state == PROCESSOR_SHUTDOWN		) {
 		register ast_t		preempt;
-processor_running:
 
 		/*
 		 *	Propagate thread ast to processor.
 		 */
-		ast_propagate(self->top_act->ast);
+		ast_propagate(thread->ast);
 
 		/*
 		 *	Context switch check.
 		 */
-		if ((preempt = csw_check(self, processor)) != AST_NONE)
+		if ((preempt = csw_check(thread, processor)) != AST_NONE)
 			ast_on(preempt);
 	}
-	else
-	if (	processor->state == PROCESSOR_DISPATCHING	||
-			processor->state == PROCESSOR_IDLE			) {
-		return;
-	}
-	else
-	if (processor->state == PROCESSOR_SHUTDOWN)
-		goto processor_running;
 }