diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-12-01 14:48:23 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-12-01 14:48:23 +0000 |
| commit | 80a766fdb6864eae613962e43ad9eb371e0ce80c (patch) | |
| tree | 85bb6589d0b8f138b721f01d4b5337ff87ba9b11 /rts/Prelude.h | |
| parent | de6c8e5293c9ef68b597ab2e6d55c3f42a283489 (diff) | |
| download | haskell-80a766fdb6864eae613962e43ad9eb371e0ce80c.tar.gz | |
Add support for the IO manager thread on Windows
Fixes #637.
The implications of this change are:
- threadDelay on Windows no longer creates a new OS thread each time,
instead it communicates with the IO manager thread in the same way as
on Unix.
- deadlock detection now works the same way on Windows as on Unix; that
is the timer interrupt wakes up the IO manager thread, which causes
the scheduler to check for deadlock.
- Console events now get sent to the IO manager thread, in the same way as
signals do on Unix. This means that console events should behave more
reliably with -threaded on Windows.
All this applies only with -threaded. Without -threaded, the old
ConsoleEvent code is still used.
After some testing, this could be pushed to the 6.6 branch.
Diffstat (limited to 'rts/Prelude.h')
| -rw-r--r-- | rts/Prelude.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/rts/Prelude.h b/rts/Prelude.h index 7d7b5b2d1d..2a6ca9158d 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -42,9 +42,7 @@ PRELUDE_CLOSURE(base_GHCziIOBase_BlockedIndefinitely_closure); PRELUDE_CLOSURE(base_GHCziIOBase_NonTermination_closure); PRELUDE_CLOSURE(base_GHCziIOBase_NestedAtomically_closure); -#if !defined(mingw32_HOST_OS) PRELUDE_CLOSURE(base_GHCziConc_ensureIOManagerIsRunning_closure); -#endif PRELUDE_INFO(base_GHCziBase_Czh_static_info); PRELUDE_INFO(base_GHCziBase_Izh_static_info); |