diff options
author | Rickard Green <[email protected]> | 2016-05-31 16:08:41 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-05-31 16:08:41 +0200 |
commit | 720d3bb101e247a88dffef9b1b07c91b46ce47d8 (patch) | |
tree | 35f71d4459227312a74222c279ba920bc86fa0c9 | |
parent | 5c76bff6187ad03c6a109567129d6e5402a00c39 (diff) | |
parent | 78afa937314431a90b1fd34c145fe7dfe799c0d4 (diff) | |
download | otp-720d3bb101e247a88dffef9b1b07c91b46ce47d8.tar.gz otp-720d3bb101e247a88dffef9b1b07c91b46ce47d8.tar.bz2 otp-720d3bb101e247a88dffef9b1b07c91b46ce47d8.zip |
Merge branch 'rickard/ts-platform-id'
* rickard/ts-platform-id:
Update TS platform_id with off-heap msgq
-rw-r--r-- | lib/common_test/test_server/ts_install.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl index b906eb21f5..5734bd0787 100644 --- a/lib/common_test/test_server/ts_install.erl +++ b/lib/common_test/test_server/ts_install.erl @@ -332,11 +332,12 @@ platform(Vars) -> LC = lock_checking(), MT = modified_timing(), AsyncThreads = async_threads(), + OffHeapMsgQ = off_heap_msgq(), Debug = debug(), CpuBits = word_size(), Common = lists:concat([Hostname,"/",OsType,"/",CpuType,CpuBits,LinuxDist, Schedulers,BindType,KP,IOTHR,LC,MT,AsyncThreads, - Debug,ExtraLabel]), + OffHeapMsgQ,Debug,ExtraLabel]), PlatformId = lists:concat([ErlType, " ", Version, Common]), PlatformLabel = ErlType ++ Common, PlatformFilename = platform_as_filename(PlatformId), @@ -400,6 +401,12 @@ async_threads() -> _ -> "" end. +off_heap_msgq() -> + case catch erlang:system_info(message_queue_data) of + off_heap -> "/OffHeapMsgQ"; + _ -> "" + end. + schedulers() -> case catch erlang:system_info(smp_support) of true -> |