diff options
| author | Lukas Larsson <lukas@erlang.org> | 2022-10-19 12:21:40 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2022-10-21 12:53:11 +0200 |
| commit | 32a34256200d7f7bc598a62ec1333c823f35e47d (patch) | |
| tree | ab8e1261c67b7fa747bfbb64abebe857ce889b97 /erts/emulator/test/binary_SUITE.erl | |
| parent | 9e4ed45dfb8364803d2bb9128b214cf80be0ba3f (diff) | |
| download | erlang-32a34256200d7f7bc598a62ec1333c823f35e47d.tar.gz | |
kernel|erts: Use memavailable for tests when available
Diffstat (limited to 'erts/emulator/test/binary_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl index c5c64c8289..5a72350d9d 100644 --- a/erts/emulator/test/binary_SUITE.erl +++ b/erts/emulator/test/binary_SUITE.erl @@ -471,10 +471,8 @@ bad_term_to_binary(Config) when is_list(Config) -> t2b_system_limit(Config) when is_list(Config) -> case erlang:system_info(wordsize) of 8 -> - case proplists:get_value(system_total_memory, - memsup:get_system_memory_data()) of - Memory when is_integer(Memory), - Memory > 6*1024*1024*1024 -> + case total_memory() of + Memory when is_integer(Memory), Memory > 6 -> do_t2b_system_limit(); _ -> {skipped, "Not enough memory on this machine"} @@ -1039,15 +1037,14 @@ report_throughput(Fun, NrOfItems) -> total_memory() -> %% Total memory in GB. try - MemoryData = memsup:get_system_memory_data(), - case lists:keysearch(total_memory, 1, MemoryData) of - {value, {total_memory, TM}} -> - TM div (1024*1024*1024); - false -> - {value, {system_total_memory, STM}} = - lists:keysearch(system_total_memory, 1, MemoryData), - STM div (1024*1024*1024) - end + SMD = memsup:get_system_memory_data(), + TM = proplists:get_value( + available_memory, SMD, + proplists:get_value( + total_memory, SMD, + proplists:get_value( + system_total_memory, SMD))), + TM div (1024*1024*1024) catch _ : _ -> undefined |