[commit: ghc] master: rts_checkSchedStatus: exit the thread, not the process, when Interrupted (674cf90)

[Simon Marlow]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/674cf902fb2cd8a4e30b3287d707d10b6efaf24d

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

commit 674cf902fb2cd8a4e30b3287d707d10b6efaf24d
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Mar 6 10:28:59 2013 +0000

    rts_checkSchedStatus: exit the thread, not the process, when Interrupted
    
    This means that when the process is shutting down, if we have calls to
    foreign exports in progress, they get forcibly terminated as before,
    but now they only shut down the calling thread rather than the whole
    process (with -threaded).
    
    This came up in a discussion started by Akio Takano on ghc-users.

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

 rts/RtsAPI.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c
index ec19b16..720b732 100644
--- a/rts/RtsAPI.c
+++ b/rts/RtsAPI.c
@@ -522,7 +522,16 @@ rts_checkSchedStatus (char* site, Capability *cap)
 	stg_exit(EXIT_FAILURE);
     case Interrupted:
 	errorBelch("%s: interrupted", site);
-	stg_exit(EXIT_FAILURE);
+#ifdef THREADED_RTS
+        // The RTS is shutting down, and the process will probably
+        // soon exit.  We don't want to preempt the shutdown
+        // by exiting the whole process here, so we just terminate the
+        // current thread.  Don't forget to release the cap first though.
+        rts_unlock(cap);
+        shutdownThread();
+#else
+        stg_exit(EXIT_FAILURE);
+#endif
     default:
 	errorBelch("%s: Return code (%d) not ok",(site),(rc));	
 	stg_exit(EXIT_FAILURE);