mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libseat/seatd: Add dispatch_pending_and_execute

Browse source 
This handler returns the number of dispatched or executed events, or -1
if dispatch_pending failed.

This helper is used to clean up dispatch_background, which now ensures
that all events are executed before we read or poll the connection, and
have improved error handling in the corner case where the second
dispatch_pending failed.
This commit is contained in:
Kenny Levinsen 2021-07-09 00:09:14 +02:00
parent 7a6d12ff7a
commit 5923e0edc9
1 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libseat/backend/seatd.c
View file

@ -262,6 +262,15 @@ static int dispatch_pending(struct backend_seatd *backend, int *opcode) {
return packets; return packets;
} }
static int dispatch_pending_and_execute(struct backend_seatd *backend) {
int dispatched = dispatch_pending(backend, NULL);
if (dispatched == -1) {
return -1;
}
dispatched += execute_events(backend);
return dispatched;
}
static int poll_connection(struct backend_seatd *backend, int timeout) { static int poll_connection(struct backend_seatd *backend, int timeout) {
struct pollfd fd = { struct pollfd fd = {
.fd = backend->connection.fd, .fd = backend->connection.fd,
@ -324,28 +333,34 @@ static int dispatch_background(struct libseat *base, int timeout) {
return -1; return -1;
} }
int dispatched = dispatch_pending(backend, NULL); int predispatch = dispatch_pending_and_execute(backend);
if (dispatched > 0) { if (predispatch == -1) {
return -1;
}
// We don't want to block if we dispatched something, as the // We don't want to block if we dispatched something, as the
// caller might be waiting for the result. However, we'd also // caller might be waiting for the result. However, we'd also
// like to read anything pending. // like to read anything pending.
timeout = 0;
}
int read = 0; int read = 0;
if (timeout == 0) { if (predispatch == 0 || timeout == 0) {
read = connection_read(&backend->connection); read = connection_read(&backend->connection);
} else { } else {
read = poll_connection(backend, timeout); read = poll_connection(backend, timeout);
} }
if (read > 0) {
dispatched += dispatch_pending(backend, NULL); if (read == 0) {
return predispatch;
} else if (read == -1 && errno != EAGAIN) { } else if (read == -1 && errno != EAGAIN) {
log_errorf("Could not read from connection: %s", strerror(errno)); log_errorf("Could not read from connection: %s", strerror(errno));
return -1; return -1;
} }
dispatched += execute_events(backend); int postdispatch = dispatch_pending_and_execute(backend);
return dispatched; if (postdispatch == -1) {
return -1;
}
return predispatch + postdispatch;
} }
static struct libseat *_open_seat(struct libseat_seat_listener *listener, void *data, int fd) { static struct libseat *_open_seat(struct libseat_seat_listener *listener, void *data, int fd) {