From 903581b7eb05a566373eb784eeb958b9cd792493 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 28 Nov 2019 19:20:25 +0100 Subject: async: first synchronous write may succeed partially When trying to write (to e.g. the slave, or to a clipboard receiver), we first try to send the data synchronously, and only if that fails do we switch to asynchronous mode. However, the first synchronous may (in fact, is likely to) succeed partially. --- selection.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'selection.c') diff --git a/selection.c b/selection.c index 8ed0b6da..2839636a 100644 --- a/selection.c +++ b/selection.c @@ -384,13 +384,14 @@ send(void *data, struct wl_data_source *wl_data_source, const char *mime_type, return; } - switch (async_write(fd, selection, len, &(size_t){0})) { + size_t async_idx = 0; + switch (async_write(fd, selection, len, &async_idx)) { case ASYNC_WRITE_REMAIN: { struct clipboard_send *ctx = malloc(sizeof(*ctx)); *ctx = (struct clipboard_send) { .data = strdup(selection), .len = len, - .idx = 0, + .idx = async_idx, }; if (fdm_add(wayl->fdm, fd, EPOLLOUT, &fdm_send, ctx)) @@ -475,13 +476,14 @@ primary_send(void *data, return; } - switch (async_write(fd, selection, len, &(size_t){0})) { + size_t async_idx = 0; + switch (async_write(fd, selection, len, &async_idx)) { case ASYNC_WRITE_REMAIN: { struct clipboard_send *ctx = malloc(sizeof(*ctx)); *ctx = (struct clipboard_send) { .data = strdup(selection), .len = len, - .idx = 0, + .idx = async_idx, }; if (fdm_add(wayl->fdm, fd, EPOLLOUT, &fdm_send, ctx)) -- cgit v1.3