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

libseat: Execute bg events after IPC calls

Browse source 
If a background event was queued during call dispatch, and no unread
data was left on the socket, there would be no incentive for the user to
call dispatch, and as a result, the events would never be executed.

Execute events at the end of IPC calls that read from the socket to
avoid stalls.
This commit is contained in:
Kenny Levinsen 2020-09-19 21:58:09 +02:00
parent 4c22c7b004
commit 6fa82930d0
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libseat/backend/seatd.c
View file

@ -379,6 +379,7 @@ static struct libseat *_open_seat(struct libseat_seat_listener *listener, void *
goto backend_error; goto backend_error;
} }
execute_events(backend);
return &backend->base; return &backend->base;
backend_error: backend_error:
@ -412,10 +413,12 @@ static int close_seat(struct libseat *base) {
goto error; goto error;
} }
execute_events(backend);
destroy(backend); destroy(backend);
return 0; return 0;
error: error:
execute_events(backend);
destroy(backend); destroy(backend);
return -1; return -1;
} }
@ -447,16 +450,21 @@ static int open_device(struct libseat *base, const char *path, int *fd) {
if (conn_put(backend, &header, sizeof header) == -1 || if (conn_put(backend, &header, sizeof header) == -1 ||
conn_put(backend, &msg, sizeof msg) == -1 || conn_put(backend, path, pathlen) == -1 || conn_put(backend, &msg, sizeof msg) == -1 || conn_put(backend, path, pathlen) == -1 ||
dispatch(backend) == -1) { dispatch(backend) == -1) {
return -1; goto error;
} }
struct proto_server_device_opened rmsg; struct proto_server_device_opened rmsg;
if (read_header(backend, SERVER_DEVICE_OPENED, sizeof rmsg, false) == SIZE_MAX || if (read_header(backend, SERVER_DEVICE_OPENED, sizeof rmsg, false) == SIZE_MAX ||
conn_get(backend, &rmsg, sizeof rmsg) == -1 || conn_get_fd(backend, fd)) { conn_get(backend, &rmsg, sizeof rmsg) == -1 || conn_get_fd(backend, fd)) {
return -1; goto error;
} }
execute_events(backend);
return rmsg.device_id; return rmsg.device_id;
error:
execute_events(backend);
return -1;
} }
static int close_device(struct libseat *base, int device_id) { static int close_device(struct libseat *base, int device_id) {
@ -479,14 +487,19 @@ static int close_device(struct libseat *base, int device_id) {
}; };
if (conn_put(backend, &header, sizeof header) == -1 || if (conn_put(backend, &header, sizeof header) == -1 ||
conn_put(backend, &msg, sizeof msg) == -1 || dispatch(backend) == -1) { conn_put(backend, &msg, sizeof msg) == -1 || dispatch(backend) == -1) {
return -1; goto error;
} }
if (read_header(backend, SERVER_DEVICE_CLOSED, 0, false) == SIZE_MAX) { if (read_header(backend, SERVER_DEVICE_CLOSED, 0, false) == SIZE_MAX) {
return -1; goto error;
} }
execute_events(backend);
return 0; return 0;
error:
execute_events(backend);
return -1;
} }
static int switch_session(struct libseat *base, int session) { static int switch_session(struct libseat *base, int session) {