projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-05 09:31:37 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsStartup.c
diff --git
a/ghc/rts/RtsStartup.c
b/ghc/rts/RtsStartup.c
index
36821d0
..
2a288b7
100644
(file)
--- a/
ghc/rts/RtsStartup.c
+++ b/
ghc/rts/RtsStartup.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.62 2002/04/26 22:35:55 sof Exp $
+ * $Id: RtsStartup.c,v 1.66 2002/08/16 13:29:06 simonmar Exp $
*
* (c) The GHC Team, 1998-2000
*
*
* (c) The GHC Team, 1998-2000
*
@@
-25,6
+25,7
@@
#include "Prelude.h" /* fixupRTStoPreludeRefs */
#include "HsFFI.h"
#include "Linker.h"
#include "Prelude.h" /* fixupRTStoPreludeRefs */
#include "HsFFI.h"
#include "Linker.h"
+#include "ThreadLabels.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
@@
-49,6
+50,8
@@
# include "LLC.h"
#endif
# include "LLC.h"
#endif
+#include <stdlib.h>
+
/*
* Flag Structure
*/
/*
* Flag Structure
*/
@@
-156,6
+159,9
@@
startupHaskell(int argc, char *argv[], void (*init_root)(void))
/* initialise the stable pointer table */
initStablePtrTable();
/* initialise the stable pointer table */
initStablePtrTable();
+ /* initialise thread label table (tso->char*) */
+ initThreadLabelTable();
+
#if defined(PROFILING) || defined(DEBUG)
initProfiling1();
#endif
#if defined(PROFILING) || defined(DEBUG)
initProfiling1();
#endif
@@
-220,7
+226,6
@@
startupHaskell(int argc, char *argv[], void (*init_root)(void))
*/
#define INIT_STACK_BLOCKS 4
F_ *init_stack = NULL;
*/
#define INIT_STACK_BLOCKS 4
F_ *init_stack = NULL;
-nat init_sp = 0;
static void
initModules ( void (*init_root)(void) )
static void
initModules ( void (*init_root)(void) )
@@
-231,6
+236,7
@@
initModules ( void (*init_root)(void) )
#else
#define cap MainCapability
#endif
#else
#define cap MainCapability
#endif
+ nat init_sp;
init_sp = 0;
bd = allocGroup(INIT_STACK_BLOCKS);
init_sp = 0;
bd = allocGroup(INIT_STACK_BLOCKS);
@@
-273,10
+279,13
@@
shutdownHaskell(void)
if (!rts_has_started_up)
return;
rts_has_started_up=0;
if (!rts_has_started_up)
return;
rts_has_started_up=0;
-
+
/* start timing the shutdown */
stat_startExit();
/* start timing the shutdown */
stat_startExit();
+ /* stop all running tasks */
+ exitScheduler();
+
#if !defined(GRAN)
/* Finalize any remaining weak pointers */
finalizeWeakPointersNow();
#if !defined(GRAN)
/* Finalize any remaining weak pointers */
finalizeWeakPointersNow();
@@
-288,9
+297,6
@@
shutdownHaskell(void)
end_gr_simulation();
#endif
end_gr_simulation();
#endif
- /* stop all running tasks */
- exitScheduler();
-
/* stop the ticker */
stopVirtTimer();
/* stop the ticker */
stopVirtTimer();