diff options
| author | Sverker Eriksson <[email protected]> | 2013-12-17 13:20:31 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-12-17 13:20:31 +0100 |
| commit | 165846b143c8275350972caaf4c1013cfe5db043 (patch) | |
| tree | 8ec4ddea514aa1a0e94249328a77df91d5195ebf /erts/preloaded/src/erts_internal.erl | |
| parent | 7d4e5e2458e0627882f49078b9757dd6ae21a6fe (diff) | |
| parent | 4b3462665c591dffa05294ce5ea94c6259446a04 (diff) | |
| download | otp-165846b143c8275350972caaf4c1013cfe5db043.tar.gz otp-165846b143c8275350972caaf4c1013cfe5db043.tar.bz2 otp-165846b143c8275350972caaf4c1013cfe5db043.zip | |
Merge tag 'OTP_R16B03_yielding_binary_to_term'
Yielding binary_to_term.
OTP-11535
* tag 'OTP_R16B03_yielding_binary_to_term':
Increase versions for OTP_R16B03_yielding_binary_to_term
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
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/vsn.mk
lib/kernel/vsn.mk
lib/stdlib/vsn.mk
Diffstat (limited to 'erts/preloaded/src/erts_internal.erl')
| -rw-r--r-- | erts/preloaded/src/erts_internal.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl index c8e8e7e069..d6a185482e 100644 --- a/erts/preloaded/src/erts_internal.erl +++ b/erts/preloaded/src/erts_internal.erl @@ -29,7 +29,7 @@ -module(erts_internal). -export([await_port_send_result/3]). - +-export([binary_to_term/1, binary_to_term/2]). -export([port_command/3, port_connect/2, port_close/1, port_control/3, port_call/3, port_info/1, port_info/2]). @@ -160,3 +160,13 @@ request_system_task(_Pid, _Prio, _Request) -> check_process_code(_Module, _OptionList) -> erlang:nif_error(undefined). +-spec binary_to_term(Binary) -> term() when + Binary :: binary(). +binary_to_term(_Binary) -> + erlang:nif_error(undefined). + +-spec binary_to_term(Binary, Opts) -> term() when + Binary :: binary(), + Opts :: [safe]. +binary_to_term(_Binary, _Opts) -> + erlang:nif_error(undefined). |