diff options
| author | Sverker Eriksson <[email protected]> | 2013-12-11 17:10:43 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-12-12 12:30:39 +0100 |
| commit | ffdbce28b5a87cde2a831922281b146fbd935b58 (patch) | |
| tree | f8eed0f70c74390ce2409e2f7aefc8c89dc0aff3 /bootstrap/lib | |
| parent | 25237481ccccd3ddfa74582dc267632ad618ba30 (diff) | |
| parent | 6cff38512b753172a7dfa2bedd60e8987156736d (diff) | |
| download | otp-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 'bootstrap/lib')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/code_server.beam | bin | 26384 -> 28536 bytes |
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_internal.beam | bin | 5176 -> 5200 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam Binary files differindex 89417b095b..896e3cb61b 100644 --- a/bootstrap/lib/kernel/ebin/code_server.beam +++ b/bootstrap/lib/kernel/ebin/code_server.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_internal.beam b/bootstrap/lib/stdlib/ebin/erl_internal.beam Binary files differindex d8c77627f1..01c6598cdc 100644 --- a/bootstrap/lib/stdlib/ebin/erl_internal.beam +++ b/bootstrap/lib/stdlib/ebin/erl_internal.beam |