diff options
| author | Sverker Eriksson <[email protected]> | 2015-12-09 18:22:42 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-12-09 18:22:42 +0100 |
| commit | 4598a8e0b8a318e0541f607897fb6cda1739bdaf (patch) | |
| tree | 09894d27b218dcbfada3383009c78a1f4909450b /erts/emulator/beam/erl_message.h | |
| parent | 683bd27d59162078248eb52d6190158f2cec5a26 (diff) | |
| parent | a2b28094081f1b185a31b33e3c1bcb377d6761bb (diff) | |
| download | otp-4598a8e0b8a318e0541f607897fb6cda1739bdaf.tar.gz otp-4598a8e0b8a318e0541f607897fb6cda1739bdaf.tar.bz2 otp-4598a8e0b8a318e0541f607897fb6cda1739bdaf.zip | |
Merge branch 'sverk/dist-ctrl-msg-overflow' into maint
OTP-13146 (more stuff)
* sverk/dist-ctrl-msg-overflow:
erts: Tweak hashmap heap size estimation
erts: Fix bug for remote control message containing fat maps
erts: Add test for remote exit signal with fat map
erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS mode
Diffstat (limited to 'erts/emulator/beam/erl_message.h')
| -rw-r--r-- | erts/emulator/beam/erl_message.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h index fbdf3fb0e2..92ba3e571c 100644 --- a/erts/emulator/beam/erl_message.h +++ b/erts/emulator/beam/erl_message.h @@ -58,7 +58,8 @@ typedef struct { FACTORY_CLOSED = 0, FACTORY_HALLOC, FACTORY_HEAP_FRAGS, - FACTORY_STATIC + FACTORY_STATIC, + FACTORY_TMP } mode; Process* p; Eterm* hp_start; @@ -75,6 +76,7 @@ void erts_factory_proc_init(ErtsHeapFactory*, Process*); void erts_factory_proc_prealloc_init(ErtsHeapFactory*, Process*, Sint size); void erts_factory_message_init(ErtsHeapFactory*, Process*, Eterm* hp, struct erl_heap_fragment*); void erts_factory_static_init(ErtsHeapFactory*, Eterm* hp, Uint size, ErlOffHeap*); +void erts_factory_tmp_init(ErtsHeapFactory*, Eterm* hp, Uint size, Uint32 atype); void erts_factory_dummy_init(ErtsHeapFactory*); Eterm* erts_produce_heap(ErtsHeapFactory*, Uint need, Uint xtra); |