summaryrefslogtreecommitdiff
path: root/rts/RtsStartup.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2016-09-15 15:53:00 +0100
committerSimon Marlow <marlowsd@gmail.com>2016-09-23 13:39:31 +0900
commit9cbcdb4863064753df0fff9054b7b7c6b3188b64 (patch)
tree76870818de45c3f1c71eaa31778005f7a161bc90 /rts/RtsStartup.c
parent8bd3d417e67e5e938dd5bfc640c3efbb683ee309 (diff)
downloadhaskell-9cbcdb4863064753df0fff9054b7b7c6b3188b64.tar.gz
shutdownHaskellAndExit: just do a normal hs_exit() (#5402)
If we want to keep the RTS alive a bit longer by having another hs_init()/hs_exit() pair in a library that will destruct itself after main() has exited, then the forced shutdown here thwarts that. I think we just "fixed" #5402 in the wrong way before, this should be better.
Diffstat (limited to 'rts/RtsStartup.c')
-rw-r--r--rts/RtsStartup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index 123fb9b64a..33ffb83c1e 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -466,10 +466,6 @@ void
shutdownHaskellAndExit(int n, int fastExit)
{
if (!fastExit) {
- // even if hs_init_count > 1, we still want to shut down the RTS
- // and exit immediately (see #5402)
- hs_init_count = 1;
-
// we're about to exit(), no need to wait for foreign calls to return.
hs_exit_(rtsFalse);
}