aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-03 00:25:41 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-03 00:25:41 +0000
commitcba1551b03254ad3efa87026d5ef2477f5eb652d (patch)
tree172b129c621555dc24231f76d9737139300d73fe
parentMerge branch 'master' into async-ptmx (diff)
terminal: cleanup asynchronous ptmx output handling
Break out actual writing to a separate function, and call this function both from the synchronous and the asynchronous code paths.
-rw-r--r--terminal.c78
1 files changed, 41 insertions, 37 deletions
diff --git a/terminal.c b/terminal.c
index 8174f0bc..a34df466 100644
--- a/terminal.c
+++ b/terminal.c
@@ -26,34 +26,49 @@
#define min(x, y) ((x) < (y) ? (x) : (y))
#define max(x, y) ((x) > (y) ? (x) : (y))
-bool
-term_to_slave(struct terminal *term, const void *_data, size_t len)
-{
- if (tll_length(term->ptmx_buffer) > 0)
- goto enqueue_data;
+enum ptmx_write_status {PTMX_WRITE_DONE, PTMX_WRITE_REMAIN, PTMX_WRITE_ERR};
- const uint8_t *data = _data;
- size_t left = len;
+static enum ptmx_write_status
+to_slave(struct terminal *term, const void *_data, size_t len, size_t *idx)
+{
+ const uint8_t *const data = _data;
+ size_t left = len - *idx;
while (left > 0) {
- ssize_t ret = write(term->ptmx, data, left);
- if (ret < 0) {
- if (errno != EAGAIN && errno != EWOULDBLOCK) {
- LOG_ERRNO("failed to write to client");
- return false;
- }
+ ssize_t ret = write(term->ptmx, &data[*idx], left);
- if (!fdm_event_add(term->fdm, term->ptmx, EPOLLOUT))
- return false;
+ if (ret < 0) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
+ return PTMX_WRITE_REMAIN;
- goto enqueue_data;
+ LOG_ERRNO("failed to write to client");
+ return PTMX_WRITE_ERR;
}
- data += ret;
- left -= ret;
+ *idx += ret;
+ left -= left;
}
- return true;
+ return PTMX_WRITE_DONE;
+}
+
+bool
+term_to_slave(struct terminal *term, const void *_data, size_t len)
+{
+ if (tll_length(term->ptmx_buffer) > 0) {
+ /* With a non-empty queue, EPOLLOUT has already been enabled */
+ goto enqueue_data;
+ }
+
+ switch (to_slave(term, _data, len, &(size_t){0})) {
+ case PTMX_WRITE_REMAIN:
+ if (!fdm_event_add(term->fdm, term->ptmx, EPOLLOUT))
+ return false;
+ goto enqueue_data;
+
+ case PTMX_WRITE_DONE: return true;
+ case PTMX_WRITE_ERR: return false;
+ }
enqueue_data:
{
@@ -78,26 +93,15 @@ fdm_ptmx_out(struct fdm *fdm, int fd, int events, void *data)
assert(tll_length(term->ptmx_buffer) > 0);
tll_foreach(term->ptmx_buffer, it) {
- const uint8_t *const data = it->item.data;
- size_t left = it->item.len - it->item.idx;
-
- while (left > 0) {
- ssize_t ret = write(term->ptmx, &data[it->item.idx], left);
- if (ret < 0) {
- if (errno != EAGAIN && errno != EWOULDBLOCK) {
- LOG_ERRNO("failed to write to client");
- return false;
- }
-
- return true;
- }
+ switch (to_slave(term, it->item.data, it->item.len, &it->item.idx)) {
+ case PTMX_WRITE_DONE:
+ free(it->item.data);
+ tll_remove(term->ptmx_buffer, it);
+ break;
- it->item.idx += ret;
- left -= ret;
+ case PTMX_WRITE_REMAIN: return true; /* to_slave() updated it->item.idx */
+ case PTMX_WRITE_ERR: return false;
}
-
- free(it->item.data);
- tll_remove(term->ptmx_buffer, it);
}
fdm_event_del(term->fdm, term->ptmx, EPOLLOUT);