xnu-792.6.61.tar.gz

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

diff --git a/osfmk/kern/ast.h b/osfmk/kern/ast.h
index 02a81b2abd75cf6b902e4b96a9c6f2d3ffefb583..5a6de8d9082f64bf51cd8d974f014391fdafcf33 100644 (file)
--- 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>
@@ -98,8 +96,6 @@ typedef uint32_t              ast_t;
 #define AST_SCHEDULING (AST_PREEMPTION | AST_YIELD | AST_HANDOFF)
 #define AST_PREEMPTION (AST_PREEMPT | AST_QUANTUM | AST_URGENT)
 
-extern volatile ast_t  need_ast[NCPUS];
-
 #ifdef  MACHINE_AST
 /*
  *      machine/ast.h is responsible for defining aston and astoff.
@@ -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,9 +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_BSD
+
+extern void astbsd_on(void);
+extern void act_set_astbsd(thread_t);
+extern void bsd_ast(thread_t);
+
+#endif /* MACH_BSD */
 
 #endif  /* _KERN_AST_H_ */