From 0166c18d23dc7f9168726bcb0d9ccc5aaca7755a Mon Sep 17 00:00:00 2001 From: Siraaj Khandkar Date: Tue, 24 Mar 2020 21:43:35 -0400 Subject: [PATCH] Handle pselect errors --- x5/khatus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/x5/khatus.c b/x5/khatus.c index 6ffa538..117fb98 100644 --- a/x5/khatus.c +++ b/x5/khatus.c @@ -429,8 +429,19 @@ fifo_read_all(Config *cfg, struct timespec *ti, char *buf) debug("selecting...\n"); ready = pselect(maxfd + 1, &fds, NULL, NULL, ti, NULL); debug("ready: %d\n", ready); - assert(ready >= 0); clock_gettime(CLOCK_MONOTONIC, &t); + if (ready == -1) { + switch (errno) { + case EINTR: + error("pselect temp failure: %d, errno: %d, msg: %s\n", + ready, errno, strerror(errno)); + /* TODO: Reconsider what to do here. */ + return; + default: + error("pselect failed: %d, errno: %d, msg: %s\n", + ready, errno, strerror(errno)); + } + } /* At-least-once ensures that expiries are still checked on timeouts. */ do { for (Fifo *f = cfg->fifos; f; f = f->next) { -- 2.20.1