X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/9bccf70c0258c7cac2dcb80011b2a964d884c552..378393581903b274cb7a4d18e0d978071a6b592d:/osfmk/kern/ast.h

diff --git a/osfmk/kern/ast.h b/osfmk/kern/ast.h
index 9d2a912c0..5a6de8d90 100644
--- a/osfmk/kern/ast.h
+++ b/osfmk/kern/ast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -57,11 +57,9 @@
 #ifndef _KERN_AST_H_
 #define _KERN_AST_H_
 
-#include <cpus.h>
 #include <platforms.h>
 
 #include <kern/assert.h>
-#include <kern/cpu_number.h>
 #include <kern/macro_help.h>
 #include <kern/lock.h>
 #include <kern/spl.h>
@@ -79,26 +77,24 @@ typedef uint32_t		ast_t;
 /*
  *      Bits for reasons
  */
-#define AST_BLOCK       0x01
-#define AST_QUANTUM     0x02
-#define AST_HANDOFF		0x04
-#define AST_YIELD		0x08
-#define	AST_URGENT		0x10
+#define AST_PREEMPT		0x01
+#define AST_QUANTUM		0x02
+#define AST_URGENT		0x04
+#define AST_HANDOFF		0x08
+#define AST_YIELD		0x10
 #define AST_APC			0x20	/* migration APC hook */
 /*
  * JMM - This is here temporarily. AST_BSD is used to simulate a
  * general purpose mechanism for setting asynchronous procedure calls
  * from the outside.
  */
-#define	AST_BSD			0x80
+#define AST_BSD			0x80
 
 #define AST_NONE		0x00
-#define	AST_ALL			(~AST_NONE)
+#define AST_ALL			(~AST_NONE)
 
-#define AST_SCHEDULING	(AST_PREEMPT | AST_YIELD | AST_HANDOFF)
-#define	AST_PREEMPT		(AST_BLOCK | AST_QUANTUM | AST_URGENT)
-
-extern volatile ast_t	need_ast[NCPUS];
+#define AST_SCHEDULING	(AST_PREEMPTION | AST_YIELD | AST_HANDOFF)
+#define AST_PREEMPTION	(AST_PREEMPT | AST_QUANTUM | AST_URGENT)
 
 #ifdef  MACHINE_AST
 /*
@@ -123,6 +119,9 @@ extern void		ast_taken(
 extern void    	ast_check(
 					processor_t		processor);
 
+/* Pending ast mask for the current processor */
+extern ast_t 	*ast_pending(void);
+
 /*
  * Per-thread ASTs are reset at context-switch time.
  */
@@ -132,40 +131,45 @@ extern void    	ast_check(
 
 #define AST_PER_THREAD	(AST_APC | AST_BSD | MACHINE_AST_PER_THREAD)
 /*
- *	ast_needed(), ast_on(), ast_off(), ast_context(), and ast_propagate()
+ *	ast_pending(), ast_on(), ast_off(), ast_context(), and ast_propagate()
  *	assume splsched.
  */
-#define ast_needed(mycpu)			(need_ast[mycpu] != AST_NONE)
 
-#define ast_on_fast(reasons)							\
-MACRO_BEGIN												\
-	int		mycpu = cpu_number();						\
-	if ((need_ast[mycpu] |= (reasons)) != AST_NONE)		\
-		{ aston(mycpu); }								\
+#define ast_on_fast(reasons)					\
+MACRO_BEGIN										\
+	ast_t	*myast = ast_pending();				\
+												\
+	if ((*myast |= (reasons)) != AST_NONE)		\
+		{ aston(myast); }						\
 MACRO_END
 
-#define ast_off_fast(reasons)							\
-MACRO_BEGIN												\
-	int		mycpu = cpu_number();						\
-	if ((need_ast[mycpu] &= ~(reasons)) == AST_NONE)	\
-		{ astoff(mycpu); }				 				\
+#define ast_off_fast(reasons)					\
+MACRO_BEGIN										\
+	ast_t	*myast = ast_pending();				\
+												\
+	if ((*myast &= ~(reasons)) == AST_NONE)		\
+		{ astoff(myast); }						\
 MACRO_END
 
 #define ast_propagate(reasons)		ast_on(reasons)
 
-#define ast_context(act, mycpu)							\
-MACRO_BEGIN												\
-	assert((mycpu) == cpu_number());					\
-	if ((need_ast[mycpu] =								\
-			((need_ast[mycpu] &~ AST_PER_THREAD) | (act)->ast)) != AST_NONE) \
-		{ aston(mycpu);	}								\
-	else												\
-		{ astoff(mycpu); }								\
+#define ast_context(act)													\
+MACRO_BEGIN																	\
+	ast_t	*myast = ast_pending();											\
+																			\
+	if ((*myast = ((*myast &~ AST_PER_THREAD) | (act)->ast)) != AST_NONE)	\
+		{ aston(myast);	}													\
+	else																	\
+		{ astoff(myast); }													\
 MACRO_END
 
 #define ast_on(reason)			     ast_on_fast(reason)
 #define ast_off(reason)			     ast_off_fast(reason)
 
+/*
+ *	NOTE: if thread is the current thread, thread_ast_set() should
+ *  be followed by ast_propagate().
+ */
 #define thread_ast_set(act, reason)		\
 						(hw_atomic_or(&(act)->ast, (reason)))
 #define thread_ast_clear(act, reason)	\
@@ -173,15 +177,12 @@ MACRO_END
 #define thread_ast_clear_all(act)		\
 						(hw_atomic_and(&(act)->ast, AST_NONE))
 
-/*
- *	NOTE: if thread is the current thread, thread_ast_set() should
- *  be followed by ast_propagate().
- */
-
-#ifdef MACH_KERNEL_PRIVATE
+#ifdef MACH_BSD
 
-#define ast_urgency()		(need_ast[cpu_number()] & AST_URGENT)
+extern void astbsd_on(void);
+extern void act_set_astbsd(thread_t);
+extern void bsd_ast(thread_t);
 
-#endif /* MACH_KERNEL_PRIVATE */
+#endif /* MACH_BSD */
 
 #endif  /* _KERN_AST_H_ */