aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/a_SUITE.erl
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-09-25 17:05:48 +0200
committerRickard Green <[email protected]>2014-09-25 17:05:48 +0200
commit3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61 (patch)
tree1bee4fc91742e3291792caacc61d20a67a80300d /erts/emulator/test/a_SUITE.erl
parent743ed31108ee555db18d9833186865e85e34333e (diff)
parent6084a42a24fca52a5de2bc487c0cd2be46dcc21f (diff)
downloadotp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.gz
otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.bz2
otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.zip
Merge branch 'rickard/eager-check-io/OTP-12117' into rickard/maint-17/eager-check-io/OTP-12117
* rickard/eager-check-io/OTP-12117: Introduce support for eager check I/O scheduling Conflicts: erts/emulator/beam/erl_bif_info.c erts/emulator/beam/erl_init.c erts/emulator/beam/erl_process.c erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/test/a_SUITE.erl')
-rw-r--r--erts/emulator/test/a_SUITE.erl14
1 files changed, 2 insertions, 12 deletions
diff --git a/erts/emulator/test/a_SUITE.erl b/erts/emulator/test/a_SUITE.erl
index 195c9c0a5f..17579be416 100644
--- a/erts/emulator/test/a_SUITE.erl
+++ b/erts/emulator/test/a_SUITE.erl
@@ -97,23 +97,13 @@ display_check_io(ChkIo) ->
catch erlang:display('--- CHECK IO INFO ---'),
catch erlang:display(ChkIo),
catch erts_debug:set_internal_state(available_internal_state, true),
- NoOfErrorFds = (catch erts_debug:get_internal_state(check_io_debug)),
+ NoOfErrorFds = (catch element(1, erts_debug:get_internal_state(check_io_debug))),
catch erlang:display({'NoOfErrorFds', NoOfErrorFds}),
catch erts_debug:set_internal_state(available_internal_state, false),
catch erlang:display('--- CHECK IO INFO ---'),
ok.
get_check_io_info() ->
- ChkIo = erlang:system_info(check_io),
- case lists:keysearch(pending_updates, 1, ChkIo) of
- {value, {pending_updates, 0}} ->
- display_check_io(ChkIo),
- ChkIo;
- false ->
- ChkIo;
- _ ->
- receive after 10 -> ok end,
- get_check_io_info()
- end.
+ z_SUITE:get_check_io_info().