diff options
| author | Rickard Green <[email protected]> | 2016-02-15 10:01:00 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-15 10:01:00 +0100 |
| commit | 28c9fe4028281029f5028758fbd0a0fc02a78d4d (patch) | |
| tree | 3c7502ac1eac57a305344fe3b9086b331353bb01 /erts/emulator/test/unique_SUITE.erl | |
| parent | cf99bf2de73be06e0f0d597dc72e3d7df1ed5f90 (diff) | |
| parent | 5d8a987285cf13e8d87731a6284c7df7ed3dac70 (diff) | |
| download | otp-28c9fe4028281029f5028758fbd0a0fc02a78d4d.tar.gz otp-28c9fe4028281029f5028758fbd0a0fc02a78d4d.tar.bz2 otp-28c9fe4028281029f5028758fbd0a0fc02a78d4d.zip | |
Merge branch 'rickard/ds-fixes' into rickard/ds-fixes-master
* rickard/ds-fixes:
Fix unique_SUITE for dirty schedulers
Add dirty scheduler process termination test
Ensure that work is done on the correct type of schedulers
Conflicts:
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
erts/emulator/beam/erl_process_dump.c
Diffstat (limited to 'erts/emulator/test/unique_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/unique_SUITE.erl | 15 |
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. |