diff options
| author | Rickard Green <[email protected]> | 2015-02-13 10:12:02 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-20 15:28:52 +0100 |
| commit | 1d9350693fe2c4d1d6b2baa504aacd070e023a1a (patch) | |
| tree | 3ac1fe2c79aaeadacdb06acaa0d106095713679a /erts/emulator/sys/common | |
| parent | 6b1921d767de5cd1a980234f83b36dbfa13d9fc7 (diff) | |
| download | otp-1d9350693fe2c4d1d6b2baa504aacd070e023a1a.tar.gz otp-1d9350693fe2c4d1d6b2baa504aacd070e023a1a.tar.bz2 otp-1d9350693fe2c4d1d6b2baa504aacd070e023a1a.zip | |
Multiple timer wheels
Diffstat (limited to 'erts/emulator/sys/common')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index 705f36c34c..7be17d20bb 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -1603,6 +1603,9 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait) ErtsMonotonicTime timeout_time; int poll_ret, i; erts_aint_t current_cio_time; + ErtsSchedulerData *esdp = erts_get_scheduler_data(); + + ASSERT(esdp); restart: @@ -1613,7 +1616,8 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait) /* Figure out timeout value */ timeout_time = (do_wait - ? erts_check_next_timeout_time(ERTS_SEC_TO_MONOTONIC(10*60)) + ? erts_check_next_timeout_time(esdp->timer_wheel, + ERTS_SEC_TO_MONOTONIC(10*60)) : ERTS_POLL_NO_TIMEOUT /* poll only */); /* |