diff options
| author | Erlang/OTP <[email protected]> | 2019-04-16 16:37:36 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-04-16 16:37:36 +0200 |
| commit | 65391703e04624539d174cb810c2af7b23b001f6 (patch) | |
| tree | 56d213504f06c618f85fb69dcf7c250ffcded285 /erts/emulator/beam/erl_bif_info.c | |
| parent | a2cc71859fdb332c9d2edd0d1408a4c1d8bc5646 (diff) | |
| parent | 8dec35910330a44de3fa08573e3029f10b3aa4ae (diff) | |
| download | otp-65391703e04624539d174cb810c2af7b23b001f6.tar.gz otp-65391703e04624539d174cb810c2af7b23b001f6.tar.bz2 otp-65391703e04624539d174cb810c2af7b23b001f6.zip | |
Merge branch 'sverker/ets-no-mbuf-trapping/OTP-15660' into maint-20
* sverker/ets-no-mbuf-trapping/OTP-15660:
erts: Remove ets traversal yielding if heap fragment
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 4050fb6146..43d99db0b2 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -4459,7 +4459,16 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) refbin)); } } - + else if (ERTS_IS_ATOM_STR("mbuf", BIF_ARG_1)) { + Uint sz = size_object(BIF_ARG_2); + ErlHeapFragment* frag = new_message_buffer(sz); + Eterm *hp = frag->mem; + Eterm copy = copy_struct(BIF_ARG_2, sz, &hp, &frag->off_heap); + frag->next = BIF_P->mbuf; + BIF_P->mbuf = frag; + BIF_P->mbuf_sz += sz; + BIF_RET(copy); + } } BIF_ERROR(BIF_P, BADARG); |