Merge pull request swiftlang#305 from apple/jblache/SR-5759-fix

MadCoder · web-flow · commit 295f67643c61 · 2017-09-21T00:27:00.000-07:00
Properly pick up new events when reusing a muxnote
diff --git a/src/event/event_epoll.c b/src/event/event_epoll.c
@@ -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;
 				dmn->dmn_disarmed_events &= ~events;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ _dispatch_unote_register(dispatch_unote_t du,`
`270`	`270`	`if (_dispatch_epoll_update(dmn, events, EPOLL_CTL_MOD) < 0) {`
`271`	`271`	`dmn = NULL;`
`272`	`272`	`} else {`
`273`		`- dmn->dmn_events = events;`
	`273`	`+ dmn->dmn_events \|= events;`
`274`	`274`	`dmn->dmn_disarmed_events &= ~events;`
`275`	`275`	`}`
`276`	`276`	`}`