projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add comment: __thread is not supported by gcc on OS X yet
[ghc-hetmet.git]
/
rts
/
RtsStartup.c
diff --git
a/rts/RtsStartup.c
b/rts/RtsStartup.c
index
f0b2170
..
1c39cf8
100644
(file)
--- a/
rts/RtsStartup.c
+++ b/
rts/RtsStartup.c
@@
-29,7
+29,6
@@
#include "sm/BlockAlloc.h"
#include "Trace.h"
#include "Stable.h"
#include "sm/BlockAlloc.h"
#include "Trace.h"
#include "Stable.h"
-#include "eventlog/EventLog.h"
#include "Hash.h"
#include "Profiling.h"
#include "Timer.h"
#include "Hash.h"
#include "Profiling.h"
#include "Timer.h"
@@
-146,7
+145,7
@@
hs_init(int *argc, char **argv[])
#endif
/* initTracing must be after setupRtsFlags() */
#endif
/* initTracing must be after setupRtsFlags() */
-#ifdef DEBUG
+#ifdef TRACING
initTracing();
#endif
initTracing();
#endif
@@
-190,12
+189,6
@@
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();
@@
-421,11
+414,9
@@
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();
- }
+#ifdef TRACING
+ endTracing();
+ freeTracing();
#endif
#if defined(TICKY_TICKY)
#endif
#if defined(TICKY_TICKY)