aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-12-11 17:10:43 +0100
committerSverker Eriksson <[email protected]>2013-12-12 12:30:39 +0100
commitffdbce28b5a87cde2a831922281b146fbd935b58 (patch)
treef8eed0f70c74390ce2409e2f7aefc8c89dc0aff3 /erts/emulator/beam/atom.names
parent25237481ccccd3ddfa74582dc267632ad618ba30 (diff)
parent6cff38512b753172a7dfa2bedd60e8987156736d (diff)
downloadotp-ffdbce28b5a87cde2a831922281b146fbd935b58.tar.gz
otp-ffdbce28b5a87cde2a831922281b146fbd935b58.tar.bz2
otp-ffdbce28b5a87cde2a831922281b146fbd935b58.zip
Merge branch 'sverk/trapping-bin2term' into OTP_R16B03
* sverk/trapping-bin2term: erts: Adjust term_to_binary reduction factors erts: Yield after trapping term_to_binary if gc has been ordered erts: Let term_to_binary disable gc while trapping erts: Improve stress of binary_to_term in binary_SUITE erts: Fix bug in binary_to_term for compressed on halfword erts: Fix crash when binary_to_term throws badarg erts: Trapping memcpy in binary_to_term erts: Cleanup code for trapping binary_to_term erts: Add erlang wrappers to binary_to_term trapping uncompress trapping size calculation trapping binary_to_term/2 trapping STRING_EXT trapping lists and tuples trapping binary_to_term passing binary_SUITE Parallel check_process_code when code_server purge a module Functionality for disabling garbage collection Use asynchronous check_process_code in code_parallel_SUITE Execution of system tasks in context of another process Conflicts: erts/emulator/beam/external.c erts/emulator/beam/sys.h erts/emulator/test/binary_SUITE.erl erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/beam/atom.names')
-rw-r--r--erts/emulator/beam/atom.names2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index c2f32ba089..71addedfdc 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -78,6 +78,7 @@ atom allocated_areas
atom allocator
atom allocator_sizes
atom alloc_util_allocators
+atom allow_gc
atom allow_passive_connect
atom already_loaded
atom amd64
@@ -114,6 +115,7 @@ atom binary_longest_prefix_trap
atom binary_longest_suffix_trap
atom binary_match_trap
atom binary_matches_trap
+atom binary_to_term_trap
atom block
atom blocked
atom bm