diff options
| author | Sverker Eriksson <[email protected]> | 2015-12-09 18:40:46 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-12-09 18:40:46 +0100 |
| commit | daff6d2d3a91a70d3e6500e90f28d2339ec6fba3 (patch) | |
| tree | b73badd8f23e97a216ef520a9ab7b0cc6ec64c14 /erts/emulator/beam/erl_message.h | |
| parent | 5690f3b07d4589ef9f843e8e9a96300bae492dee (diff) | |
| parent | 7016d21eb3bec1bfb9381292be9f31cc25eadb03 (diff) | |
| download | otp-daff6d2d3a91a70d3e6500e90f28d2339ec6fba3.tar.gz otp-daff6d2d3a91a70d3e6500e90f28d2339ec6fba3.tar.bz2 otp-daff6d2d3a91a70d3e6500e90f28d2339ec6fba3.zip | |
Merge branch 'sverk/dist-ctrl-msg-overflow-master' into master
* sverk/dist-ctrl-msg-overflow-master:
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 fa9bb2ecde..60035d15ae 100644 --- a/erts/emulator/beam/erl_message.h +++ b/erts/emulator/beam/erl_message.h @@ -58,7 +58,8 @@ typedef struct { FACTORY_HALLOC, FACTORY_MESSAGE, FACTORY_HEAP_FRAGS, - FACTORY_STATIC + FACTORY_STATIC, + FACTORY_TMP } mode; Process* p; Eterm* hp_start; @@ -80,6 +81,7 @@ ErtsMessage *erts_factory_message_create(ErtsHeapFactory *, Process *, ErtsProcLocks *, Uint sz); void erts_factory_selfcontained_message_init(ErtsHeapFactory*, ErtsMessage *, Eterm *); 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); |