aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-02-12 16:20:23 +0100
committerRickard Green <[email protected]>2016-02-15 09:55:42 +0100
commit5d8a987285cf13e8d87731a6284c7df7ed3dac70 (patch)
treef0800cdcfeacf9f60358dddad16df19f4b55ef35
parent57cff1f4286a9511926ee37c015b3f6f081d64d0 (diff)
downloadotp-5d8a987285cf13e8d87731a6284c7df7ed3dac70.tar.gz
otp-5d8a987285cf13e8d87731a6284c7df7ed3dac70.tar.bz2
otp-5d8a987285cf13e8d87731a6284c7df7ed3dac70.zip
Fix unique_SUITE for dirty schedulers
-rw-r--r--erts/emulator/test/unique_SUITE.erl15
1 files changed, 13 insertions, 2 deletions
diff --git a/erts/emulator/test/unique_SUITE.erl b/erts/emulator/test/unique_SUITE.erl
index 6fa634b886..a6884d63a6 100644
--- a/erts/emulator/test/unique_SUITE.erl
+++ b/erts/emulator/test/unique_SUITE.erl
@@ -267,10 +267,21 @@ calc_sched_bits(NoScheds, Shift) when NoScheds < 1 bsl Shift ->
calc_sched_bits(NoScheds, Shift) ->
calc_sched_bits(NoScheds, Shift+1).
+schedulers() ->
+ S = erlang:system_info(schedulers),
+ try
+ DCPUS = erlang:system_info(dirty_cpu_schedulers),
+ DIOS = erlang:system_info(dirty_io_schedulers),
+ S+DCPUS+DIOS
+ catch
+ _ : _ ->
+ S
+ end.
+
init_uniqint_info() ->
SmallBits = erlang:system_info({wordsize, internal})*8-4,
io:format("SmallBits=~p~n", [SmallBits]),
- Schedulers = erlang:system_info(schedulers),
+ Schedulers = schedulers(),
io:format("Schedulers=~p~n", [Schedulers]),
MinSmall = -1*(1 bsl (SmallBits-1)),
io:format("MinSmall=~p~n", [MinSmall]),
@@ -337,7 +348,7 @@ check_uniqint(Int, UinqintInfo) ->
true ->
io:format("OK~n~n", []);
false ->
- io:format("result UniqInt=~p FAILED~n", [UniqInt]),
+ io:format("result Int=~p FAILED~n", [Int]),
exit(badres)
end.