X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsStartup.c;h=2a288b7d009777fbea62b2bc35da6200a42e54f2;hb=05a9c035960327b23bad8d8dc501141b183f33b5;hp=af3d86f46313f3b971ffb2860856dca6b0a27cc0;hpb=57c9c08cfcfba3906800664bffd46d74685a9286;p=ghc-hetmet.git diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c index af3d86f..2a288b7 100644 --- a/ghc/rts/RtsStartup.c +++ b/ghc/rts/RtsStartup.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsStartup.c,v 1.46 2000/12/19 14:30:58 simonmar Exp $ + * $Id: RtsStartup.c,v 1.66 2002/08/16 13:29:06 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -7,6 +7,7 @@ * * ---------------------------------------------------------------------------*/ +#include "PosixSource.h" #include "Rts.h" #include "RtsAPI.h" #include "RtsUtils.h" @@ -22,11 +23,9 @@ #include "StgRun.h" #include "StgStartup.h" #include "Prelude.h" /* fixupRTStoPreludeRefs */ - -#ifdef GHCI #include "HsFFI.h" #include "Linker.h" -#endif +#include "ThreadLabels.h" #if defined(RTS_GTK_FRONTPANEL) #include "FrontPanel.h" @@ -35,19 +34,24 @@ #if defined(PROFILING) || defined(DEBUG) # include "Profiling.h" # include "ProfHeap.h" +# include "RetainerProfile.h" #endif #if defined(GRAN) -#include "GranSimRts.h" -#include "ParallelRts.h" +# include "GranSimRts.h" +#endif + +#if defined(GRAN) || defined(PAR) +# include "ParallelRts.h" #endif #if defined(PAR) -#include "ParInit.h" -#include "Parallel.h" -#include "LLC.h" +# include "Parallel.h" +# include "LLC.h" #endif +#include + /* * Flag Structure */ @@ -55,11 +59,11 @@ struct RTS_FLAGS RtsFlags; static int rts_has_started_up = 0; #if defined(PAR) -static ullong startTime = 0; +ullong startTime = 0; #endif -EXTFUN(__init_Prelude); -static void initModules ( void * ); +EXTFUN(__stginit_Prelude); +static void initModules ( void (*)(void) ); void setProgArgv(int argc, char *argv[]) @@ -82,13 +86,18 @@ getProgArgv(int *argc, char **argv[]) void -startupHaskell(int argc, char *argv[], void *init_root) +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. @@ -96,25 +105,19 @@ startupHaskell(int argc, char *argv[], void *init_root) stat_startInit(); #ifdef PAR -/* - * The parallel system needs to be initialised and synchronised before - * the program is run. - */ - fprintf(stderr, "startupHaskell: argv[0]=%s\n", argv[0]); - if (*argv[0] == '-') { /* Look to see whether we're the Main Thread */ - IAmMainThread = rtsTrue; - argv++; argc--; /* Strip off flag argument */ - // IF_PAR_DEBUG(verbose, - fprintf(stderr, "[%x] I am Main Thread\n", mytid); + /* + * The parallel system needs to be initialised and synchronised before + * the program is run. + */ + startupParallelSystem(argv); + + if (*argv[0] == '-') { /* Strip off mainPE flag argument */ + argv++; + argc--; } - /* - * Grab the number of PEs out of the argument vector, and - * eliminate it from further argument processing. - */ - nPEs = atoi(argv[1]); - argv[1] = argv[0]; + + argv[1] = argv[0]; /* ignore the nPEs argument */ argv++; argc--; - initEachPEHook(); /* HWL: hook to be execed on each PE */ #endif /* Set the RTS flags to default values. */ @@ -130,8 +133,9 @@ startupHaskell(int argc, char *argv[], void *init_root) #if defined(PAR) /* NB: this really must be done after processing the RTS flags */ - fprintf(stderr, "Synchronising system (%d PEs)\n", nPEs); - SynchroniseSystem(); // calls initParallelSystem etc + IF_PAR_DEBUG(verbose, + fprintf(stderr, "==== Synchronising system (%d PEs)\n", nPEs)); + synchroniseSystem(); // calls initParallelSystem etc #endif /* PAR */ /* initialise scheduler data structures (needs to be done before @@ -152,35 +156,25 @@ startupHaskell(int argc, char *argv[], void *init_root) /* initialize the storage manager */ initStorage(); - /* initialise the object linker, if necessary */ -#ifdef GHCI - initLinker(); -#endif - /* initialise the stable pointer table */ initStablePtrTable(); + /* initialise thread label table (tso->char*) */ + initThreadLabelTable(); + #if defined(PROFILING) || defined(DEBUG) initProfiling1(); #endif /* run the per-module initialisation code */ -#if !defined(INTERPRETER) initModules(init_root); -#endif #if defined(PROFILING) || defined(DEBUG) 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(); @@ -189,17 +183,9 @@ startupHaskell(int argc, char *argv[], void *init_root) /* Initialise the user signal handler set */ initUserSignals(); /* Set up handler to run on SIGINT, etc. */ - init_default_handlers(); + initDefaultHandlers(); #endif -#if !defined(INTERPRETER) - /* Initialise pointers from the RTS to the prelude. - Only for compiled code -- the interpreter - will call this itself later, so don't do so now. - */ - fixupRTStoPreludeRefs(NULL); -#endif - #ifdef RTS_GTK_FRONTPANEL if (RtsFlags.GcFlags.frontpanel) { initFrontPanel(); @@ -226,9 +212,9 @@ startupHaskell(int argc, char *argv[], void *init_root) - 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, @@ -238,32 +224,34 @@ startupHaskell(int argc, char *argv[], void *init_root) /* 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; -#ifndef INTERPRETER static void -initModules ( void *init_root ) +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); } -#endif /* !INTERPRETER */ /* ----------------------------------------------------------------------------- * Shutting down the RTS - two ways of doing this, one which @@ -277,7 +265,12 @@ shutdownHaskellAndExit(int n) { OnExitHook(); shutdownHaskell(); +#if defined(PAR) + /* really exit (stg_exit() would call shutdownParallelSystem() again) */ + exit(n); +#else stg_exit(n); +#endif } void @@ -285,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(); @@ -300,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); @@ -312,7 +306,11 @@ shutdownHaskell(void) resetNonBlockingFd(2); #if defined(PAR) + /* controlled exit; good thread! */ shutdownParallelSystem(0); + + /* global statistics in parallel system */ + PAR_TICKY_PAR_END(); #endif /* stop timing the shutdown, we're about to print stats */ @@ -329,33 +327,46 @@ 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; - } /* * called from STG-land to exit the program */ +#ifdef PAR +static int exit_started=rtsFalse; +#endif + void stg_exit(I_ n) -{ -#if 0 /* def PAR */ - par_exit(n); -#else - exit(n); +{ +#ifdef PAR + /* HACK: avoid a loop when exiting due to a stupid error */ + if (exit_started) + return; + exit_started=rtsTrue; + + IF_PAR_DEBUG(verbose, fprintf(stderr,"==-- stg_exit %d on [%x]...", n, mytid)); + shutdownParallelSystem(n); #endif + exit(n); }