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/emulator/beam/atom.names | |
| 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/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index fb223d2a5d..0167286bbf 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -182,6 +182,7 @@ atom control atom copy atom copy_literals atom counters +atom count atom cpu atom cpu_timestamp atom cr @@ -287,6 +288,7 @@ atom gc_minor_end atom gc_minor_start atom Ge='>=' atom generational +atom get_all_trap atom get_seq_token atom get_tcw atom gather_gc_info_result @@ -325,6 +327,7 @@ atom index atom infinity atom info atom info_msg +atom info_trap atom init atom initial_call atom input |