X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsStartup.c;h=2a288b7d009777fbea62b2bc35da6200a42e54f2;hb=351afa5ad7cc7012d5460c126cad4999e457a30d;hp=8732c9a7f60481da7e9c64ab763fa9940d4ce163;hpb=bc5c802181b513216bc88f0d1ec9574157ee05fe;p=ghc-hetmet.git diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c index 8732c9a..2a288b7 100644 --- a/ghc/rts/RtsStartup.c +++ b/ghc/rts/RtsStartup.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsStartup.c,v 1.52 2001/08/14 13:40:09 sewardj Exp $ + * $Id: RtsStartup.c,v 1.66 2002/08/16 13:29:06 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -25,6 +25,7 @@ #include "Prelude.h" /* fixupRTStoPreludeRefs */ #include "HsFFI.h" #include "Linker.h" +#include "ThreadLabels.h" #if defined(RTS_GTK_FRONTPANEL) #include "FrontPanel.h" @@ -33,6 +34,7 @@ #if defined(PROFILING) || defined(DEBUG) # include "Profiling.h" # include "ProfHeap.h" +# include "RetainerProfile.h" #endif #if defined(GRAN) @@ -48,6 +50,8 @@ # include "LLC.h" #endif +#include + /* * Flag Structure */ @@ -58,7 +62,7 @@ static int rts_has_started_up = 0; ullong startTime = 0; #endif -EXTFUN(__init_Prelude); +EXTFUN(__stginit_Prelude); static void initModules ( void (*)(void) ); void @@ -84,11 +88,16 @@ getProgArgv(int *argc, char **argv[]) void 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; + /* To avoid repeated initialisations of the RTS */ + 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. @@ -150,6 +159,9 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void)) /* initialise the stable pointer table */ initStablePtrTable(); + /* initialise thread label table (tso->char*) */ + initThreadLabelTable(); + #if defined(PROFILING) || defined(DEBUG) initProfiling1(); #endif @@ -161,14 +173,8 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void)) initProfiling2(); #endif - /* start the ticker */ - install_vtalrm_handler(); - initialize_virtual_timer(TICK_MILLISECS); - - /* start our haskell execution tasks */ -#ifdef SMP - startTasks(); -#endif + /* start the virtual timer 'subsystem'. */ + startVirtTimer(TICK_MILLISECS); /* Initialise the stats department */ initStats(); @@ -177,7 +183,7 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void)) /* Initialise the user signal handler set */ initUserSignals(); /* Set up handler to run on SIGINT, etc. */ - init_default_handlers(); + initDefaultHandlers(); #endif #ifdef RTS_GTK_FRONTPANEL @@ -206,9 +212,9 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void)) - we supply a unique integer to each statically declared cost centre and cost centre stack in the program. - The code generator inserts a small function "__init_" in each - module and calls the registration functions in each of the modules - it imports. So, if we call "__init_PrelMain", each reachable module in the + The code generator inserts a small function "__stginit_" in each + module and calls the registration functions in each of the modules it + imports. So, if we call "__stginit_PrelMain", each reachable module in the program will be registered (because PrelMain.mainIO calls Main.main). The init* functions are compiled in the same way as STG code, @@ -218,29 +224,33 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void)) /* The init functions use an explicit stack... */ -#define INIT_STACK_SIZE (BLOCK_SIZE * 4) +#define INIT_STACK_BLOCKS 4 F_ *init_stack = NULL; -nat init_sp = 0; static void initModules ( void (*init_root)(void) ) { + bdescr *bd; #ifdef SMP Capability cap; #else -#define cap MainRegTable +#define cap MainCapability #endif + nat init_sp; init_sp = 0; - init_stack = (F_ *)allocate(INIT_STACK_SIZE / sizeof(W_)); + bd = allocGroup(INIT_STACK_BLOCKS); + init_stack = (F_ *)bd->start; init_stack[init_sp++] = (F_)stg_init_ret; - init_stack[init_sp++] = (F_)__init_Prelude; + init_stack[init_sp++] = (F_)__stginit_Prelude; if (init_root != NULL) { init_stack[init_sp++] = (F_)init_root; } - cap.rSp = (P_)(init_stack + init_sp); - StgRun((StgFunPtr)stg_init, &cap); + cap.r.rSp = (P_)(init_stack + init_sp); + StgRun((StgFunPtr)stg_init, &cap.r); + + freeGroup(bd); } /* ----------------------------------------------------------------------------- @@ -268,10 +278,14 @@ shutdownHaskell(void) { if (!rts_has_started_up) return; - + rts_has_started_up=0; + /* start timing the shutdown */ stat_startExit(); + /* stop all running tasks */ + exitScheduler(); + #if !defined(GRAN) /* Finalize any remaining weak pointers */ finalizeWeakPointersNow(); @@ -283,11 +297,8 @@ shutdownHaskell(void) end_gr_simulation(); #endif - /* stop all running tasks */ - exitScheduler(); - /* stop the ticker */ - initialize_virtual_timer(0); + stopVirtTimer(); /* reset the standard file descriptors to blocking mode */ resetNonBlockingFd(0); @@ -316,19 +327,24 @@ shutdownHaskell(void) } #endif +#if defined(PROFILING) + reportCCSProfiling(); +#endif + #if defined(PROFILING) || defined(DEBUG) endProfiling(); #endif -#if defined(PROFILING) - report_ccs_profiling(); +#ifdef PROFILING + // Originally, this was in report_ccs_profiling(). Now, retainer + // profiling might tack some extra stuff on to the end of this file + // during endProfiling(). + fclose(prof_file); #endif #if defined(TICKY_TICKY) if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo(); #endif - - rts_has_started_up=0; } /*