From: simonmar <unknown>
Date: Fri, 27 Feb 2004 13:35:16 +0000 (+0000)
Subject: [project @ 2004-02-27 13:35:16 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~43
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=8fcae518e33613c93b55ab5f165954727cf4aa30;p=ghc-hetmet.git

[project @ 2004-02-27 13:35:16 by simonmar]
hs_exit(): call exitScheduler() *after* finalizeWeakPointersNow(),
because the latter needs to create/run threads.
---

diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c
index edbf88a..5255386 100644
--- a/ghc/rts/RtsStartup.c
+++ b/ghc/rts/RtsStartup.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.78 2003/09/26 12:12:35 panne Exp $
+ * $Id: RtsStartup.c,v 1.79 2004/02/27 13:35:16 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2002
  *
@@ -324,14 +324,14 @@ hs_exit(void)
     /* start timing the shutdown */
     stat_startExit();
     
-    /* stop all running tasks */
-    exitScheduler();
-    
 #if !defined(GRAN)
     /* Finalize any remaining weak pointers */
     finalizeWeakPointersNow();
 #endif
     
+    /* stop all running tasks */
+    exitScheduler();
+    
 #if defined(GRAN)
     /* end_gr_simulation prints global stats if requested -- HWL */
     if (!RtsFlags.GranFlags.GranSimStats.Suppressed)