diff options
| author | Lukas Larsson <[email protected]> | 2012-06-04 11:34:42 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-04 11:34:42 +0200 |
| commit | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (patch) | |
| tree | 94058c8df73356197dca04da701d5b0402d12b59 /erts/emulator/beam/dist.c | |
| parent | 9d590cf3db1210882c82a82381a07ae8f9535f79 (diff) | |
| parent | 5c2dad487e6af1a48fa3a1f3d985b6b891788bde (diff) | |
| download | otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.gz otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.bz2 otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.zip | |
Merge branch 'bjorn/remove-hybrid-heap/OTP-10105' into maint
* bjorn/remove-hybrid-heap/OTP-10105:
Remove stale code for hybrid heap and incremental GC
Remove the hipe_bifs:show_message_area/0 BIF
Remove support for erlang:system_info(global_heaps_size)
Remove the erlang:garbage_collect_message_area/0 BIF
Remove workarounds for hybrid and shared heaps in test suites
Diffstat (limited to 'erts/emulator/beam/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 7c75c9fdb7..01fd63d5d9 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -1582,11 +1582,9 @@ int erts_net_message(Port *prt, } erts_cleanup_offheap(&off_heap); -#ifndef HYBRID /* FIND ME! */ if (ctl != ctl_default) { erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl); } -#endif UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE); ERTS_SMP_CHK_NO_PROC_LOCKS; return 0; @@ -1599,11 +1597,9 @@ int erts_net_message(Port *prt, data_error: PURIFY_MSG("data error"); erts_cleanup_offheap(&off_heap); -#ifndef HYBRID /* FIND ME! */ if (ctl != ctl_default) { erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl); } -#endif UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE); erts_do_exit_port(prt, dep->cid, am_killed); ERTS_SMP_CHK_NO_PROC_LOCKS; |