X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Finterrupt.h;h=ff649ce11fa204093310393c52ad908bd90e95e6;hb=afb24f64fe95ed8ebce578ba7526b8a0a7aa5f14;hp=ee13671b0f86ebb39adf5298e31894d0f2b4b343;hpb=6c605fa4b46d3fee9304c4e40e0e605aa5a24f28;p=sbcl.git

diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h
index ee13671..ff649ce 100644
--- a/src/runtime/interrupt.h
+++ b/src/runtime/interrupt.h
@@ -26,7 +26,9 @@
 /* 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();
+extern void check_blockables_blocked_or_lose(void);
+extern void check_gc_signals_unblocked_or_lose(void);
+extern void unblock_gc_signals(void);
 
 static inline void
 sigcopyset(sigset_t *new, sigset_t *old)
@@ -36,12 +38,30 @@ sigcopyset(sigset_t *new, sigset_t *old)
 
 /* maximum signal nesting depth
  *
- * 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
-
- * Nothing happened, so let's creep it back a bit further -- dan 20030411 */
-#define MAX_INTERRUPTS 32
+ * FIXME: In CMUCL this was 4096, and it was first scaled down to 256
+ * and then 32, until finally Stumpwm broke: it is possible to receive
+ * interrupts in sufficiently quick succession that handler nesting
+ * can become preposterous. Scaling this back up to 1024 is a bandaid:
+ * for a real fix we should consider the following things:
+ *
+ *   We should almost certainly always use
+ *   arrange_return_to_lisp_function, though it needs to be thought
+ *   about arguments, and it needs to be able to pass a frobbable
+ *   context to the callee...
+ *
+ *   There are cases when nesting handlers is exactly what we want:
+ *   eg. SIGINT.
+ *
+ *   There are cases when we probably want to drop duplicate signals
+ *   on the floor if they arrive before the previous one has been handled.
+ *   Eg. SIGPROF.
+ *
+ *   There are cases when we probably want to handle duplicate signals
+ *   after the previous handler has returned, not before. Eg. SIGALARM.
+ *
+ * -- NS 2007-01-29
+ */
+#define MAX_INTERRUPTS 1024
 
 union interrupt_handler {
     lispobj lisp;
@@ -60,16 +80,14 @@ struct interrupt_data {
 };
 
 
-extern void interrupt_init();
+extern void interrupt_init(void);
 extern void fake_foreign_function_call(os_context_t* context);
 extern void undo_fake_foreign_function_call(os_context_t* context);
 extern void arrange_return_to_lisp_function(os_context_t *, lispobj);
-extern void interrupt_handle_now(int, siginfo_t*, void*);
+extern void interrupt_handle_now(int, siginfo_t*, os_context_t*);
 extern void interrupt_handle_pending(os_context_t*);
 extern void interrupt_internal_error(os_context_t*, 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,
                                    int signal, siginfo_t *info,
                                    os_context_t *context);
@@ -82,13 +100,12 @@ extern void do_pending_interrupt(void);
 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*));
+typedef void (*interrupt_handler_t)(int, siginfo_t *, void *);
+extern void undoably_install_low_level_interrupt_handler (
+                        int signal,
+                        interrupt_handler_t handler);
 extern unsigned long install_handler(int signal,
-                                     void handler(int, siginfo_t*, void*));
+                                     interrupt_handler_t handler);
 
 extern union interrupt_handler interrupt_handlers[NSIG];
 
@@ -97,7 +114,7 @@ extern void sigaddset_deferrable(sigset_t *s);
 /* Set all blockable signals into *s. */
 extern void sigaddset_blockable(sigset_t *s);
 
-extern void block_blockable_signals();
+extern void block_blockable_signals(void);
 
 /* The void* casting here avoids having to mess with the various types
  * of function argument lists possible for signal handlers:
@@ -106,7 +123,7 @@ extern void block_blockable_signals();
  * "cleanly" with union types is in fact a mess. */
 #define ARE_SAME_HANDLER(x, y) ((void*)(x) == (void*)(y))
 
-extern boolean maybe_handle_trap(os_context_t *context, int trap);
+extern void handle_trap(os_context_t *context, int trap);
 
 #ifndef LISP_FEATURE_WIN32
 extern void lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr);