picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

event: instead of reset the revents field when we get new revents data from epoll, OR it in

This commit is contained in:
Lennart Poettering 2013-12-14 05:08:15 +01:00
parent 15b38f936e
commit 9a800b5622
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libsystemd-bus/sd-event.c
View File

@ -1569,12 +1569,21 @@ static int event_arm_timer(
return 0;
}
static int process_io(sd_event *e, sd_event_source *s, uint32_t events) {
static int process_io(sd_event *e, sd_event_source *s, uint32_t revents) {
assert(e);
assert(s);
assert(s->type == SOURCE_IO);
s->io.revents = events;
/* If the event source was already pending, we just OR in the
* new revents, otherwise we reset the value. The ORing is
* necessary to handle EPOLLONESHOT events properly where
* readability might happen independently of writability, and
* we need to keep track of both */
if (s->pending)
s->io.revents |= revents;
else
s->io.revents = revents;
return source_set_pending(s, true);
}