[project @ 2005-01-21 19:58:51 by sof]

[ghc-hetmet.git] / ghc / rts / win32 / ConsoleHandler.c

diff --git a/ghc/rts/win32/ConsoleHandler.c b/ghc/rts/win32/ConsoleHandler.c
index a1d3bd9..a6a53a0 100644 (file)
--- a/ghc/rts/win32/ConsoleHandler.c
+++ b/ghc/rts/win32/ConsoleHandler.c
@@ -9,6 +9,7 @@
 #include "Schedule.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
+#include "AsyncIO.h"
 
 extern int stg_InstallConsoleEvent(int action, StgStablePtr *handler);
 
@@ -63,6 +64,9 @@ static BOOL WINAPI shutdown_handler(DWORD dwCtrlType)
            stg_exit(EXIT_INTERRUPTED);
        } else {
            interruptStgRts();
+           /* Cheesy pulsing of an event to wake up a waiting RTS thread, if any */
+           abandonRequestWait();
+           resetAbandonRequestWait();
        }
        return TRUE;
 
@@ -197,11 +201,15 @@ static BOOL WINAPI generic_handler(DWORD dwCtrlType)
         */
        return FALSE;
     default:
+       if (!deliver_event) return TRUE;
+
        if ( stg_pending_events < N_PENDING_EVENTS ) {
            stg_pending_buf[stg_pending_events] = dwCtrlType;
            stg_pending_events++;
        }
-       context_switch = 1;
+       /* Cheesy pulsing of an event to wake up a waiting RTS thread, if any */
+       abandonRequestWait();
+       resetAbandonRequestWait();
        return TRUE;
     }
 }