watchdog: fix timeout not running if polling returned early #622
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -75,11 +76,16 @@ void Watchdog::Run(void* arg) { | |||
|
|
|||
|
|
|||
| void Watchdog::Async(uv_async_t* async) { | |||
| Watchdog* w = ContainerOf(&Watchdog::async_, async); | |||
| // stop the loop | |||
There was a problem hiding this comment.
That comment is a bit superfluous, isn't it? :-)
|
LGTM. Maybe the commit log can go into a little more detail. |
Switch from running the loop with UV_RUN_ONCE to UV_RUN_DEFAULT, because it's possible that the poll returns earlier than expected and thus the timer is not run on a single interation. The loop is not stopped either from the timer callback or from the async handle's.
|
Fixed, can you PTAL? |
|
LGTM. @rvagg? |
|
yes, this is excellent, thanks @saghul additional context to explain what's going on here for the record libuv/libuv#168 |
rvagg
pushed a commit
that referenced
this pull request
Jan 27, 2015
Switch from running the loop with UV_RUN_ONCE to UV_RUN_DEFAULT, because it's possible that the poll returns earlier than expected and thus the timer is not run on a single interation. The loop is not stopped either from the timer callback or from the async handle's. PR-URL: #622 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Rod Vagg <[email protected]>
|
landed @ b50fea4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
R=@bnoordhuis
R=@rvagg
Jenkins: https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/119/