projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Massive patch for the first months work adding System FC to GHC #25
[ghc-hetmet.git]
/
rts
/
RtsStartup.c
diff --git
a/rts/RtsStartup.c
b/rts/RtsStartup.c
index
33c742b
..
62a347a
100644
(file)
--- a/
rts/RtsStartup.c
+++ b/
rts/RtsStartup.c
@@
-28,6
+28,7
@@
#include "ThreadLabels.h"
#include "BlockAlloc.h"
#include "Trace.h"
#include "ThreadLabels.h"
#include "BlockAlloc.h"
#include "Trace.h"
+#include "RtsTypeable.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
@@
-196,6
+197,9
@@
hs_init(int *argc, char **argv[])
/* initialise the stable pointer table */
initStablePtrTable();
/* initialise the stable pointer table */
initStablePtrTable();
+ /* initialise the shared Typeable store */
+ initTypeableStore();
+
#if defined(DEBUG)
/* initialise thread label table (tso->char*) */
initThreadLabelTable();
#if defined(DEBUG)
/* initialise thread label table (tso->char*) */
initThreadLabelTable();
@@
-206,7
+210,7
@@
hs_init(int *argc, char **argv[])
#endif
/* start the virtual timer 'subsystem'. */
#endif
/* start the virtual timer 'subsystem'. */
- startTimer(TICK_MILLISECS);
+ startTimer();
/* Initialise the stats department */
initStats();
/* Initialise the stats department */
initStats();
@@
-390,6
+394,9
@@
hs_exit(void)
// also outputs the stats (+RTS -s) info.
exitStorage();
// also outputs the stats (+RTS -s) info.
exitStorage();
+ /* free shared Typeable store */
+ exitTypeableStore();
+
/* initialise the stable pointer table */
exitStablePtrTable();
/* initialise the stable pointer table */
exitStablePtrTable();
@@
-459,6
+466,8
@@
shutdownHaskellAndExit(int n)
static int exit_started=rtsFalse;
#endif
static int exit_started=rtsFalse;
#endif
+void (*exitFn)(int) = 0;
+
void
stg_exit(int n)
{
void
stg_exit(int n)
{
@@
-471,5
+480,7
@@
stg_exit(int n)
IF_PAR_DEBUG(verbose, debugBelch("==-- stg_exit %d on [%x]...", n, mytid));
shutdownParallelSystem(n);
#endif
IF_PAR_DEBUG(verbose, debugBelch("==-- stg_exit %d on [%x]...", n, mytid));
shutdownParallelSystem(n);
#endif
+ if (exitFn)
+ (*exitFn)(n);
exit(n);
}
exit(n);
}