[commit: ghc] master: Terminate in forkProcess like in real_main (44853a1)

git at git.haskell.org git at git.haskell.org
Mon Aug 4 13:13:02 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/44853a157a394bf00d1fdfff1926a6d178d8018c/ghc

>---------------------------------------------------------------

commit 44853a157a394bf00d1fdfff1926a6d178d8018c
Author: Edsko de Vries <edsko at well-typed.com>
Date:   Mon Aug 4 08:09:11 2014 -0500

    Terminate in forkProcess like in real_main
    
    Test Plan: validate
    
    Reviewers: simonmar, austin
    
    Reviewed By: simonmar, austin
    
    Subscribers: phaskell, simonmar, relrod, carter
    
    Differential Revision: https://phabricator.haskell.org/D99
    
    GHC Trac Issues: #9377


>---------------------------------------------------------------

44853a157a394bf00d1fdfff1926a6d178d8018c
 rts/Schedule.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 140221b..ad1cffc 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1937,8 +1937,7 @@ forkProcess(HsStablePtr *entry
 	rts_checkSchedStatus("forkProcess",cap);
 	
 	rts_unlock(cap);
-	hs_exit();                      // clean up and exit
-	stg_exit(EXIT_SUCCESS);
+        shutdownHaskellAndExit(EXIT_SUCCESS, 0 /* !fastExit */);
     }
 #else /* !FORKPROCESS_PRIMOP_SUPPORTED */
     barf("forkProcess#: primop not supported on this platform, sorry!\n");



More information about the ghc-commits mailing list