diff options
| author | Björn Gustavsson <[email protected]> | 2018-11-06 12:06:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-11-06 12:06:32 +0100 |
| commit | abde22933f5a617376d7db9fd91690e901c996ef (patch) | |
| tree | 7efe4f3dd9baf5c48cde8b01481c0ef661bbd780 /erts/preloaded/src/init.erl | |
| parent | c2a3104849583a9e1aa5370873457975bef67296 (diff) | |
| parent | adffe592c98149ac3b7333cf6e46970a13a57350 (diff) | |
| download | otp-abde22933f5a617376d7db9fd91690e901c996ef.tar.gz otp-abde22933f5a617376d7db9fd91690e901c996ef.tar.bz2 otp-abde22933f5a617376d7db9fd91690e901c996ef.zip | |
Merge branch 'maint'
* maint:
Implement a tab for persistent terms in crashdump viewer
Add tests of persistent terms for crashdump_viewer
Add a persistent term storage
Refactor releasing of literals
Extend the sharing-preserving routines to optionally copy literals
Conflicts:
erts/emulator/Makefile.in
erts/emulator/beam/erl_process_dump.c
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/init.beam
lib/sasl/src/systools_make.erl
Diffstat (limited to 'erts/preloaded/src/init.erl')
| -rw-r--r-- | erts/preloaded/src/init.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 277e60c180..d8f5c9a945 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -546,6 +546,7 @@ stop(Reason,State) -> do_stop(restart,#state{start = Start, flags = Flags, args = Args}) -> %% Make sure we don't have any outstanding messages before doing the restart. flush(), + erts_internal:erase_persistent_terms(), boot(Start,Flags,Args); do_stop(reboot,_) -> halt(); |