diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-12-01 14:07:53 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-12-01 14:07:53 +0000 |
| commit | de6c8e5293c9ef68b597ab2e6d55c3f42a283489 (patch) | |
| tree | a5e9a295a2c8485b81a901f9f80465cfe40a4cc9 /rts | |
| parent | 8971f720a67113308e346598814221228b12a4fc (diff) | |
| download | haskell-de6c8e5293c9ef68b597ab2e6d55c3f42a283489.tar.gz | |
Remove the Windows Async IO Manager completely in THREADED_RTS mode
It isn't used here anyway, just making sure the code doesn't get compiled in.
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/RtsStartup.c | 6 | ||||
| -rw-r--r-- | rts/win32/AsyncIO.c | 4 | ||||
| -rw-r--r-- | rts/win32/IOManager.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c index c2f765a9be..dba529bb20 100644 --- a/rts/RtsStartup.c +++ b/rts/RtsStartup.c @@ -56,7 +56,7 @@ # include "LLC.h" #endif -#if defined(mingw32_HOST_OS) +#if defined(mingw32_HOST_OS) && !defined(THREADED_RTS) #include "win32/AsyncIO.h" #endif @@ -254,7 +254,7 @@ hs_init(int *argc, char **argv[]) initDefaultHandlers(); #endif -#if defined(mingw32_HOST_OS) +#if defined(mingw32_HOST_OS) && !defined(THREADED_RTS) startupAsyncIO(); #endif @@ -465,7 +465,7 @@ hs_exit(void) if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo(); #endif -#if defined(mingw32_HOST_OS) +#if defined(mingw32_HOST_OS) && !defined(THREADED_RTS) shutdownAsyncIO(); #endif diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c index d471ee8879..cd0cf38bab 100644 --- a/rts/win32/AsyncIO.c +++ b/rts/win32/AsyncIO.c @@ -4,6 +4,9 @@ * * (c) sof, 2002-2003. */ + +#if !defined(THREADED_RTS) + #include "Rts.h" #include "RtsUtils.h" #include <windows.h> @@ -354,3 +357,4 @@ resetAbandonRequestWait( void ) ResetEvent(abandon_req_wait); } +#endif /* !defined(THREADED_RTS) */ diff --git a/rts/win32/IOManager.c b/rts/win32/IOManager.c index 2123b8c3a4..764be69872 100644 --- a/rts/win32/IOManager.c +++ b/rts/win32/IOManager.c @@ -4,6 +4,9 @@ * * (c) sof, 2002-2003. */ + +#if !defined(THREADED_RTS) + #include "Rts.h" #include "IOManager.h" #include "WorkQueue.h" @@ -526,3 +529,5 @@ abandonWorkRequest ( int reqID ) */ LeaveCriticalSection(&ioMan->active_work_lock); } + +#endif |