Properly pick up new events when reusing a muxnote #305
Conversation
This file contains hidden or 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
Changes for SR-5759 introduced a bug where disarmed events got dropped when a muxnote is reused, due to erroneously setting dmn->dmn_events to the combination of new events and currently armed events. Combining existing events with the combination of new events and armed events implements the intended behavior.
MadCoder
approved these changes
Sep 21, 2017
| @@ -270,7 +270,7 @@ _dispatch_unote_register(dispatch_unote_t du, | |||
| if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_MOD) < 0) { | |||
| dmn = NULL; | |||
| } else { | |||
| dmn->dmn_events = events; | |||
| dmn->dmn_events |= events; | |||
There was a problem hiding this comment.
you gotta love 1-character fixes
|
@swift-ci please test |
|
Seems the buildbot is broken, however the fix is obviously correct, so let's merge. |
ktopley-apple
pushed a commit
that referenced
this pull request
Dec 6, 2018
Properly pick up new events when reusing a muxnote Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
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.
Changes for SR-5759 introduced a bug where disarmed events got dropped when
a muxnote is reused, due to erroneously setting dmn->dmn_events to the
combination of new events and currently armed events.
Combining existing events with the combination of new events and armed events
implements the intended behavior.