/* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.57 2001/11/26 16:54:22 simonmar Exp $
+ * $Id: RtsStartup.c,v 1.67 2002/12/11 15:36:48 simonmar Exp $
*
* (c) The GHC Team, 1998-2000
*
#include "Prelude.h" /* fixupRTStoPreludeRefs */
#include "HsFFI.h"
#include "Linker.h"
+#include "ThreadLabels.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
# include "LLC.h"
#endif
+#include <stdlib.h>
+
/*
* Flag Structure
*/
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.
/* initialise the stable pointer table */
initStablePtrTable();
+ /* initialise thread label table (tso->char*) */
+ initThreadLabelTable();
+
#if defined(PROFILING) || defined(DEBUG)
initProfiling1();
#endif
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();
*/
#define INIT_STACK_BLOCKS 4
F_ *init_stack = NULL;
-nat init_sp = 0;
static void
initModules ( void (*init_root)(void) )
#else
#define cap MainCapability
#endif
+ nat init_sp;
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[init_sp++] = (F_)__stginit_Prelude;
if (init_root != NULL) {
init_stack[init_sp++] = (F_)init_root;
}
{
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();
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);
#endif
#if defined(PROFILING)
- report_ccs_profiling();
+ reportCCSProfiling();
#endif
#if defined(PROFILING) || defined(DEBUG)
#if defined(TICKY_TICKY)
if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
#endif
-
- rts_has_started_up=0;
}
/*
#endif
void
-stg_exit(I_ n)
+stg_exit(int n)
{
#ifdef PAR
/* HACK: avoid a loop when exiting due to a stupid error */