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/dist.c | |
| 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/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 4846133aa6..170690ca89 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -1153,7 +1153,6 @@ int erts_net_message(Port *prt, Process* rp; DeclareTmpHeapNoproc(ctl_default,DIST_CTL_DEFAULT_SIZE); Eterm* ctl = ctl_default; - ErlOffHeap off_heap; ErtsHeapFactory factory; Eterm* hp; Sint type; @@ -1168,9 +1167,6 @@ int erts_net_message(Port *prt, #endif UseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE); - /* Thanks to Luke Gorrie */ - off_heap.first = NULL; - off_heap.overhead = 0; ERTS_SMP_CHK_NO_PROC_LOCKS; @@ -1231,7 +1227,7 @@ int erts_net_message(Port *prt, } hp = ctl; - erts_factory_static_init(&factory, ctl, ctl_len, &off_heap); + erts_factory_tmp_init(&factory, ctl, ctl_len, ERTS_ALC_T_DCTRL_BUF); arg = erts_decode_dist_ext(&factory, &ede); if (is_non_value(arg)) { #ifdef ERTS_DIST_MSG_DBG @@ -1719,7 +1715,7 @@ int erts_net_message(Port *prt, goto invalid_message; } - erts_cleanup_offheap(&off_heap); + erts_factory_close(&factory); if (ctl != ctl_default) { erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl); } @@ -1734,7 +1730,7 @@ int erts_net_message(Port *prt, } data_error: PURIFY_MSG("data error"); - erts_cleanup_offheap(&off_heap); + erts_factory_close(&factory); if (ctl != ctl_default) { erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl); } |