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/sys/common/erl_check_io.c | |
| 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/sys/common/erl_check_io.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index c681fa481f..ac9a070bce 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -2262,14 +2262,14 @@ erts_check_io_info(void *proc) #if ERTS_POLL_USE_FALLBACK erts_poll_info_flbk(get_fallback_pollset(), &piv[0]); - piv[0].poll_threads = 1; + piv[0].poll_threads = 0; piv[0].active_fds = 0; piv++; #endif #if ERTS_POLL_USE_SCHEDULER_POLLING erts_poll_info(get_scheduler_pollset(0), &piv[0]); - piv[0].poll_threads = 1; + piv[0].poll_threads = 0; piv[0].active_fds = 0; piv++; #endif |