[project @ 2004-10-02 07:32:25 by dons]

[ghc-hetmet.git] / ghc / rts / RtsUtils.c

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index 99bea75..f4d61b1 100644 (file)
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -10,10 +10,8 @@
 /* #include "PosixSource.h" */
 
 #include "Rts.h"
-#include "RtsTypes.h"
 #include "RtsAPI.h"
 #include "RtsFlags.h"
-#include "Hooks.h"
 #include "RtsUtils.h"
 #include "Ticky.h"
 
@@ -34,90 +32,14 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-/* -----------------------------------------------------------------------------
-   General message generation functions
-
-   All messages should go through here.  We can't guarantee that
-   stdout/stderr will be available - e.g. in a Windows program there
-   is no console for generating messages, so they have to either go to
-   to the debug console, or pop up message boxes.
-   -------------------------------------------------------------------------- */
-
-RtsMsgFunction *fatalInternalMsgFn = stdioFatalInternalMsgFn;
-RtsMsgFunction *debugMsgFn         = stdioDebugMsgFn;
-RtsMsgFunction *errorMsgFn         = stdioErrorMsgFn;
-
-void
-barf(char *s, ...)
-{
-  va_list ap;
-  va_start(ap,s);
-  (*fatalInternalMsgFn)(s,ap);
-  stg_exit(EXIT_INTERNAL_ERROR);
-  va_end(ap);
-}
-
-void
-errorBelch(char *s, ...)
-{
-  va_list ap;
-  va_start(ap,s);
-  (*errorMsgFn)(s,ap);
-  va_end(ap);
-}
-
-void
-debugBelch(char *s, ...)
-{
-  va_list ap;
-  va_start(ap,s);
-  (*debugMsgFn)(s,ap);
-  va_end(ap);
-}
-
-void
-vdebugBelch(char *s, va_list ap)
-{
-  (*debugMsgFn)(s,ap);
-}
-
-/* -----------------------------------------------------------------------------
-   stdio versions of the message functions
-   -------------------------------------------------------------------------- */
-
-void 
-stdioFatalInternalMsgFn(char *s, va_list ap)
-{
-  /* don't fflush(stdout); WORKAROUND bug in Linux glibc */
-  if (prog_argv != NULL && prog_name != NULL) {
-    fprintf(stderr, "%s: internal error: ", prog_name);
-  } else {
-    fprintf(stderr, "internal error: ");
-  }
-  vfprintf(stderr, s, ap);
-  fprintf(stderr, "\n");
-  fprintf(stderr, "    Please report this as a bug to glasgow-haskell-bugs@haskell.org,\n    or http://www.sourceforge.net/projects/ghc/\n");
-  fflush(stderr);
-}
-
-void
-stdioErrorMsgFn(char *s, va_list ap)
-{
-  /* don't fflush(stdout); WORKAROUND bug in Linux glibc */
-  if (prog_argv != NULL && prog_name != NULL) {
-    fprintf(stderr, "%s: ", prog_name);
-  } 
-  vfprintf(stderr, s, ap);
-  fprintf(stderr, "\n");
-}
-
-void
-stdioDebugMsgFn(char *s, va_list ap)
-{
-  /* don't fflush(stdout); WORKAROUND bug in Linux glibc */
-  vfprintf(stderr, s, ap);
-  fflush(stderr);
-}
+#if defined(openbsd_TARGET_OS)
+# ifdef HAVE_SIGNAL_H
+#  include <signal.h>
+# endif
+# ifdef HAVE_PTHREAD_H
+#  include <pthread.h>
+# endif
+#endif
 
 /* -----------------------------------------------------------------------------
    Result-checking malloc wrappers.
@@ -375,3 +297,19 @@ heapCheckFail( void )
 }
 #endif
 
+/* 
+ * It seems that pthreads and signals interact oddly in OpenBSD
+ * pthreads (and possibly FreeBSD). When linking with -lpthreads, we
+ * have to use pthread_kill to send blockable signals. So use that
+ * when we have a threaded rts. So System.Posix.Signals will call
+ * genericRaise(), rather than raise(3).
+ */
+#if defined(openbsd_TARGET_OS)
+int genericRaise(int sig) {
+# if defined(THREADED_RTS)
+        return pthread_kill(pthread_self(), sig);
+# else
+        return raise(sig);
+# endif
+}
+#endif