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-20 15:40:32 by simonpj]
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsStartup.c
diff --git
a/ghc/rts/RtsStartup.c
b/ghc/rts/RtsStartup.c
index
51b1ec9
..
2a288b7
100644
(file)
--- a/
ghc/rts/RtsStartup.c
+++ b/
ghc/rts/RtsStartup.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.58 2001/11/27 01:51:23 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
*/
@@
-86,10
+89,15
@@
void
startupHaskell(int argc, char *argv[], void (*init_root)(void))
{
/* To avoid repeated initialisations of the RTS */
startupHaskell(int argc, char *argv[], void (*init_root)(void))
{
/* To avoid repeated initialisations of the RTS */
- if (rts_has_started_up)
- return;
- else
- rts_has_started_up=1;
+ if (rts_has_started_up) {
+ /* RTS is up and running, so only run the per-module initialisation code */
+ if (init_root) {
+ initModules(init_root);
+ }
+ return;
+ } else {
+ rts_has_started_up=1;
+ }
/* The very first thing we do is grab the start time...just in case we're
* collecting timing statistics.
/* The very first thing we do is grab the start time...just in case we're
* collecting timing statistics.
@@
-151,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
@@
-165,11
+176,6
@@
startupHaskell(int argc, char *argv[], void (*init_root)(void))
/* start the virtual timer 'subsystem'. */
startVirtTimer(TICK_MILLISECS);
/* start the virtual timer 'subsystem'. */
startVirtTimer(TICK_MILLISECS);
- /* start our haskell execution tasks */
-#ifdef SMP
- startTasks();
-#endif
-
/* Initialise the stats department */
initStats();
/* Initialise the stats department */
initStats();
@@
-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,9
+236,10
@@
initModules ( void (*init_root)(void) )
#else
#define cap MainCapability
#endif
#else
#define cap MainCapability
#endif
+ nat init_sp;
init_sp = 0;
init_sp = 0;
- bd = allocGroup(4);
+ bd = allocGroup(INIT_STACK_BLOCKS);
init_stack = (F_ *)bd->start;
init_stack[init_sp++] = (F_)stg_init_ret;
init_stack[init_sp++] = (F_)__stginit_Prelude;
init_stack = (F_ *)bd->start;
init_stack[init_sp++] = (F_)stg_init_ret;
init_stack[init_sp++] = (F_)__stginit_Prelude;
@@
-272,10
+278,14
@@
shutdownHaskell(void)
{
if (!rts_has_started_up)
return;
{
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();
@@
-287,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();
@@
-321,7
+328,7
@@
shutdownHaskell(void)
#endif
#if defined(PROFILING)
#endif
#if defined(PROFILING)
- report_ccs_profiling();
+ reportCCSProfiling();
#endif
#if defined(PROFILING) || defined(DEBUG)
#endif
#if defined(PROFILING) || defined(DEBUG)
@@
-338,8
+345,6
@@
shutdownHaskell(void)
#if defined(TICKY_TICKY)
if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
#endif
#if defined(TICKY_TICKY)
if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
#endif
-
- rts_has_started_up=0;
}
/*
}
/*