X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.h;h=651668cdb7db56dba200db8a53732ac984aaac04;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=acf80acc83cbbfeb90ad95abb1907ae0eb5f3838;hpb=d8e682fdfb7e8ba067e15aea0f3d1f8d37ca9eb1;p=sbcl.git

diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h
index acf80ac..651668c 100644
--- a/src/runtime/interrupt.h
+++ b/src/runtime/interrupt.h
@@ -25,6 +25,8 @@
 /* FIXME: do not rely on NSIG being a multiple of 8 */
 #define REAL_SIGSET_SIZE_BYTES ((NSIG/8))
 
+extern void check_blockables_blocked_or_lose();
+
 static inline void
 sigcopyset(sigset_t *new, sigset_t *old)
 {
@@ -35,7 +37,7 @@ sigcopyset(sigset_t *new, sigset_t *old)
  *
  * Note: In CMU CL, this was 4096, but there was no explanation given,
  * and it's hard to see why we'd need that many nested interrupts, so
- * I've scaled it back (to 256) to see what happens. -- WHN 20000730 
+ * I've scaled it back (to 256) to see what happens. -- WHN 20000730
 
  * Nothing happened, so let's creep it back a bit further -- dan 20030411 */
 #define MAX_INTERRUPTS 32
@@ -45,14 +47,13 @@ union interrupt_handler {
     void (*c)(int, siginfo_t*, void*);
 };
 
-struct interrupt_data {
-    void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, void*) ;
-    union interrupt_handler interrupt_handlers[NSIG];
+extern union interrupt_handler interrupt_handlers[NSIG];
 
-    /* signal information for pending signal.  pending_signal=0 when there 
+struct interrupt_data {
+    /* signal information for pending signal.  pending_signal=0 when there
      * is no pending signal. */
     void (*pending_handler) (int, siginfo_t*, void*) ;
-    int pending_signal ;
+    int pending_signal;
     siginfo_t pending_info;
     sigset_t pending_mask;
 };
@@ -65,8 +66,8 @@ extern void arrange_return_to_lisp_function(os_context_t *, lispobj);
 extern void interrupt_handle_now(int, siginfo_t*, void*);
 extern void interrupt_handle_pending(os_context_t*);
 extern void interrupt_internal_error(int, siginfo_t*, os_context_t*,
-				     boolean continuable);
-extern boolean handle_guard_page_triggered(os_context_t *,void *);
+                                     boolean continuable);
+extern boolean handle_guard_page_triggered(os_context_t *,os_vm_address_t);
 extern boolean interrupt_maybe_gc(int, siginfo_t*, void*);
 extern boolean interrupt_maybe_gc_int(int, siginfo_t *, void *);
 extern boolean maybe_defer_handler(void *handler, struct interrupt_data *data,
@@ -82,17 +83,21 @@ extern void interrupt_thread_handler(int, siginfo_t*, void*);
 extern void sig_stop_for_gc_handler(int, siginfo_t*, void*);
 #endif
 extern void undoably_install_low_level_interrupt_handler (int signal,
-							  void
-							  handler(int,
-								  siginfo_t*,
-								  void*));
+                                                          void
+                                                          handler(int,
+                                                                  siginfo_t*,
+                                                                  void*));
 extern unsigned long install_handler(int signal,
-				     void handler(int, siginfo_t*, void*));
+                                     void handler(int, siginfo_t*, void*));
 
 extern union interrupt_handler interrupt_handlers[NSIG];
 
+/* Set all deferrable signals into *s. */
+extern void sigaddset_deferrable(sigset_t *s);
 /* Set all blockable signals into *s. */
-void sigaddset_blockable(sigset_t *s);
+extern void sigaddset_blockable(sigset_t *s);
+
+extern void block_blockable_signals();
 
 /* The void* casting here avoids having to mess with the various types
  * of function argument lists possible for signal handlers:
@@ -102,4 +107,3 @@ void sigaddset_blockable(sigset_t *s);
 #define ARE_SAME_HANDLER(x, y) ((void*)(x) == (void*)(y))
 
 #endif
-