projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More rules for bootstrapping
[ghc-hetmet.git]
/
rts
/
RtsStartup.c
diff --git
a/rts/RtsStartup.c
b/rts/RtsStartup.c
index
b9442d2
..
c9edeac
100644
(file)
--- a/
rts/RtsStartup.c
+++ b/
rts/RtsStartup.c
@@
-30,10
+30,11
@@
#include "ThreadLabels.h"
#include "BlockAlloc.h"
#include "Trace.h"
#include "ThreadLabels.h"
#include "BlockAlloc.h"
#include "Trace.h"
-#include "RtsTypeable.h"
+#include "RtsGlobals.h"
#include "Stable.h"
#include "Hpc.h"
#include "FileLock.h"
#include "Stable.h"
#include "Hpc.h"
#include "FileLock.h"
+#include "EventLog.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
#if defined(RTS_GTK_FRONTPANEL)
#include "FrontPanel.h"
@@
-195,7
+196,9
@@
hs_init(int *argc, char **argv[])
#endif
/* initTracing must be after setupRtsFlags() */
#endif
/* initTracing must be after setupRtsFlags() */
+#ifdef DEBUG
initTracing();
initTracing();
+#endif
#if defined(PAR)
/* NB: this really must be done after processing the RTS flags */
#if defined(PAR)
/* NB: this really must be done after processing the RTS flags */
@@
-240,7
+243,7
@@
hs_init(int *argc, char **argv[])
getStablePtr((StgPtr)blockedIndefinitely_closure);
/* initialise the shared Typeable store */
getStablePtr((StgPtr)blockedIndefinitely_closure);
/* initialise the shared Typeable store */
- initTypeableStore();
+ initGlobalStore();
/* initialise file locking, if necessary */
#if !defined(mingw32_HOST_OS)
/* initialise file locking, if necessary */
#if !defined(mingw32_HOST_OS)
@@
-254,6
+257,12
@@
hs_init(int *argc, char **argv[])
initProfiling1();
initProfiling1();
+#ifdef EVENTLOG
+ if (RtsFlags.EventLogFlags.doEventLogging) {
+ initEventLogging();
+ }
+#endif
+
/* start the virtual timer 'subsystem'. */
initTimer();
startTimer();
/* start the virtual timer 'subsystem'. */
initTimer();
startTimer();
@@
-479,7
+488,7
@@
hs_exit_(rtsBool wait_foreign)
freeScheduler();
/* free shared Typeable store */
freeScheduler();
/* free shared Typeable store */
- exitTypeableStore();
+ exitGlobalStore();
/* free file locking tables, if necessary */
#if !defined(mingw32_HOST_OS)
/* free file locking tables, if necessary */
#if !defined(mingw32_HOST_OS)
@@
-514,6
+523,13
@@
hs_exit_(rtsBool wait_foreign)
if (prof_file != NULL) fclose(prof_file);
#endif
if (prof_file != NULL) fclose(prof_file);
#endif
+#ifdef EVENTLOG
+ if (RtsFlags.EventLogFlags.doEventLogging) {
+ endEventLogging();
+ freeEventLogging();
+ }
+#endif
+
#if defined(TICKY_TICKY)
if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
#endif
#if defined(TICKY_TICKY)
if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
#endif