#ifndef _SBCL_RUNTIME_H_
#define _SBCL_RUNTIME_H_
-/*#define QSHOW */ /* Enable low-level debugging output? */
-
-#ifdef QSHOW
-#define FSHOW(args) fprintf args
-#define SHOW(string) FSHOW((stderr, "/%s\n", string))
+#if defined(LISP_FEATURE_SB_THREAD)
+#define thread_self() pthread_self()
+#define thread_kill pthread_kill
+#define thread_sigmask pthread_sigmask
+#define thread_mutex_lock(l) pthread_mutex_lock(l)
+#define thread_mutex_unlock(l) pthread_mutex_unlock(l)
#else
-#define FSHOW(args)
-#define SHOW(string)
+#define thread_self() 0
+#define thread_kill kill_safely
+#define thread_sigmask sigprocmask
+#define thread_mutex_lock(l) 0
+#define thread_mutex_unlock(l) 0
#endif
+/* Block blockable interrupts for each SHOW, if not 0. */
+#define QSHOW_SIGNAL_SAFE 1
/* Enable extra-verbose low-level debugging output for signals? (You
* probably don't want this unless you're trying to debug very early
* cold boot on a new machine, or one where you've just messed up
* causes output from signal handlers, and the i/o libraries aren't
* necessarily reentrant. But it can still be very convenient for
* figuring out what's going on when you have a signal handling
- * problem.. */
+ * problem. */
#define QSHOW_SIGNALS 0
+/* Enable low-level debugging output, if not zero. Defaults to enabled
+ * if QSHOW_SIGNALS, disabled otherwise. Change it to 1 if you want
+ * low-level debugging output but not the whole signal mess. */
+#define QSHOW QSHOW_SIGNALS
+
+#if QSHOW
+
+#if QSHOW_SIGNAL_SAFE
+
+#include <signal.h>
+extern sigset_t blockable_sigset;
+
+#define QSHOW_BLOCK \
+ sigset_t oldset; \
+ thread_sigmask(SIG_BLOCK, &blockable_sigset, &oldset);
+#define QSHOW_UNBLOCK thread_sigmask(SIG_SETMASK,&oldset,0);
+#else
+#define QSHOW_BLOCK
+#define QSHOW_UNBLOCK
+#endif
+
+#ifdef LISP_FEATURE_SB_THREAD
+#define QSHOW_PREFIX fprintf(stderr, "%lu ", pthread_self());
+#else
+#define QSHOW_PREFIX
+#endif
+
+#define FSHOW(args) \
+ do { \
+ QSHOW_BLOCK \
+ QSHOW_PREFIX \
+ fprintf args; \
+ QSHOW_UNBLOCK \
+ } while (0)
+#define SHOW(string) FSHOW((stderr, "/%s\n", string))
+
+#else
+
+#define FSHOW(args)
+#define SHOW(string)
+
+#endif
#if QSHOW_SIGNALS
#define FSHOW_SIGNAL FSHOW