aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-06-04 11:34:42 +0200
committerLukas Larsson <[email protected]>2012-06-04 11:34:42 +0200
commit9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (patch)
tree94058c8df73356197dca04da701d5b0402d12b59 /lib/test_server/src
parent9d590cf3db1210882c82a82381a07ae8f9535f79 (diff)
parent5c2dad487e6af1a48fa3a1f3d985b6b891788bde (diff)
downloadotp-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 'lib/test_server/src')
-rw-r--r--lib/test_server/src/ts_install.erl9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index c70a41be4b..84d686e7a2 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -280,12 +280,11 @@ platform(Vars) ->
LC = lock_checking(),
MT = modified_timing(),
AsyncThreads = async_threads(),
- HeapType = heap_type_label(),
Debug = debug(),
CpuBits = word_size(),
Common = lists:concat([Hostname,"/",OsType,"/",CpuType,CpuBits,LinuxDist,
Schedulers,BindType,KP,IOTHR,LC,MT,AsyncThreads,
- HeapType,Debug,ExtraLabel]),
+ Debug,ExtraLabel]),
PlatformId = lists:concat([ErlType, " ", Version, Common]),
PlatformLabel = ErlType ++ Common,
PlatformFilename = platform_as_filename(PlatformId),
@@ -343,12 +342,6 @@ hostname() ->
"/localhost"
end.
-heap_type_label() ->
- case catch erlang:system_info(heap_type) of
- hybrid -> "/Hybrid";
- _ -> "" %private
- end.
-
async_threads() ->
case catch erlang:system_info(threads) of
true -> "/A"++integer_to_list(erlang:system_info(thread_pool_size));