projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the tracing of the startup event more regular
[ghc-hetmet.git]
/
rts
/
RtsStartup.c
diff --git
a/rts/RtsStartup.c
b/rts/RtsStartup.c
index
236d07a
..
0dacd61
100644
(file)
--- a/
rts/RtsStartup.c
+++ b/
rts/RtsStartup.c
@@
-144,9
+144,9
@@
hs_init(int *argc, char **argv[])
#ifdef TRACING
initTracing();
#endif
#ifdef TRACING
initTracing();
#endif
- /* Dtrace events are always enabled
+ /* Trace the startup event
*/
*/
- dtraceEventStartup();
+ traceEventStartup();
/* initialise scheduler data structures (needs to be done before
* initStorage()).
/* initialise scheduler data structures (needs to be done before
* initStorage()).
@@
-297,9
+297,6
@@
hs_exit_(rtsBool wait_foreign)
checkFPUStack();
#endif
checkFPUStack();
#endif
- // Free the full argv storage
- freeFullProgArgv();
-
#if defined(THREADED_RTS)
ioManagerDie();
#endif
#if defined(THREADED_RTS)
ioManagerDie();
#endif
@@
-402,6
+399,8
@@
hs_exit_(rtsBool wait_foreign)
// heap memory (e.g. by being passed a ByteArray#).
freeStorage(wait_foreign);
// heap memory (e.g. by being passed a ByteArray#).
freeStorage(wait_foreign);
+ // Free the various argvs
+ freeRtsArgs();
}
// The real hs_exit():
}
// The real hs_exit():