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/test/node_container_SUITE.erl | |
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/test/node_container_SUITE.erl')
-rw-r--r-- | erts/emulator/test/node_container_SUITE.erl | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl index aa83459ef8..0bf2c03233 100644 --- a/erts/emulator/test/node_container_SUITE.erl +++ b/erts/emulator/test/node_container_SUITE.erl @@ -459,10 +459,6 @@ make_node_garbage(_, _, _, Ps) -> end, lists:foreach(fun (P) -> wait_until(fun () -> ProcIsCleanedUp(P) end) end, Ps), - ?line case erlang:system_info(heap_type) of - shared -> ?line garbage_collect(); - _ -> ?line ok - end, ?line ok. @@ -605,17 +601,7 @@ node_controller_refc(Config) when is_list(Config) -> % Get rid of all references to Node ?line exec(P, fun () -> exit(normal) end), ?line wait_until(fun () -> not is_process_alive(P) end), - ?line case erlang:system_info(heap_type) of - shared -> - ?line garbage_collect(); - hybrid -> - ?line lists:foreach(fun (Proc) -> garbage_collect(Proc) end, - processes()), - ?line erlang:garbage_collect_message_area(); - _ -> - ?line lists:foreach(fun (Proc) -> garbage_collect(Proc) end, - processes()) - end, + lists:foreach(fun (Proc) -> garbage_collect(Proc) end, processes()), ?line false = get_node_references({Node,Creation}), ?line false = get_dist_references(Node), ?line false = lists:member(Node, nodes(known)), |