diff options
| author | Lukas Larsson <[email protected]> | 2019-01-23 10:22:17 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-23 10:22:17 +0100 |
| commit | aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782 (patch) | |
| tree | f8d2df95eed18df1a2402488fefd8aa10df9897f /erts/emulator/test/driver_SUITE.erl | |
| parent | 3aba68193ab414cd807fe0757a6b6f8f20bd57ef (diff) | |
| parent | a53f58ff4fc68f069c395966a0b7375523c77b65 (diff) | |
| download | otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.tar.gz otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.tar.bz2 otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.zip | |
Merge branch 'lukas/erts/scheduler-pollset-fixes/OTP-15538' into maint
* lukas/erts/scheduler-pollset-fixes/OTP-15538:
erts: Fix getting of poll events on linux >= 4.15.0
erts: Use reduction based polling for starved poll-set
erts: Fix pollset test cases
Diffstat (limited to 'erts/emulator/test/driver_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index bd62708aa7..1d2ae4fb51 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -1069,14 +1069,19 @@ get_stable_check_io_info(N) -> get_check_io_total(ChkIo) -> ct:log("ChkIo = ~p~n",[ChkIo]), {Fallback, Rest} = get_fallback(ChkIo), + OnlyPollThreads = [PS || PS <- Rest, not is_scheduler_pollset(PS)], add_fallback_infos(Fallback, - lists:foldl(fun(Pollset, Acc) -> - lists:zipwith(fun(A, B) -> - add_pollset_infos(A,B) - end, - Pollset, Acc) - end, - hd(Rest), tl(Rest))). + lists:foldl( + fun(Pollset, Acc) -> + lists:zipwith(fun(A, B) -> + add_pollset_infos(A,B) + end, + Pollset, Acc) + end, + hd(OnlyPollThreads), tl(OnlyPollThreads))). + +is_scheduler_pollset(Pollset) -> + proplists:get_value(poll_threads, Pollset) == 0. add_pollset_infos({Tag, A}=TA , {Tag, B}=TB) -> case tag_type(Tag) of |