From: Alexander Turenko <alexander.turenko@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH 13/13] popen: use of exception safe functions for IO
Date: Fri, 10 Apr 2020 05:50:51 +0300 [thread overview]
Message-ID: <b2534698431284d8ef9141fc51d3a55989dc1015.1586486220.git.alexander.turenko@tarantool.org> (raw)
In-Reply-To: <cover.1586486219.git.alexander.turenko@tarantool.org>
popen read / write functions provides are written in C and intended to
be used from C: the contract is to return -1 at failure and set an entry
to the diagnostics area. However a C++ exception from coio read / write
functions would pass over a popen function stack frame.
The solution is to use the recently introduced coio exception safe
functions.
Part of #4031
---
src/lib/core/popen.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/lib/core/popen.c b/src/lib/core/popen.c
index bf7d597bd..d39d8640a 100644
--- a/src/lib/core/popen.c
+++ b/src/lib/core/popen.c
@@ -321,8 +321,10 @@ popen_write_timeout(struct popen_handle *handle, const void *buf,
handle->pid, stdX_str(idx), idx, buf, count,
handle->ios[idx].fd, timeout);
- return coio_write_timeout(&handle->ios[idx], buf,
- count, timeout);
+ int rc = coio_write_timeout_noxc(&handle->ios[idx], buf, count,
+ timeout);
+ assert(rc < 0 || rc == (ssize_t)count);
+ return rc;
}
/**
@@ -383,8 +385,8 @@ popen_read_timeout(struct popen_handle *handle, void *buf,
handle->pid, stdX_str(idx), idx, buf, count,
handle->ios[idx].fd, timeout);
- return coio_read_ahead_timeout(&handle->ios[idx], buf, 1, count,
- timeout);
+ return coio_read_ahead_timeout_noxc(&handle->ios[idx], buf, 1, count,
+ timeout);
}
/**
--
2.25.0
next prev parent reply other threads:[~2020-04-10 2:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 2:50 [Tarantool-patches] [PATCH 00/13] Popen Lua API: preliminary patches Alexander Turenko
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 01/13] popen: require popen handle to be non-NULL Alexander Turenko
2020-04-10 7:16 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 02/13] popen: remove retval from popen_state() Alexander Turenko
2020-04-10 7:17 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 03/13] popen: add missed diag_set in popen_signal/delete Alexander Turenko
2020-04-10 7:23 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 04/13] popen: add logging of fds closed in a child Alexander Turenko
2020-04-10 7:46 ` Cyrill Gorcunov
2020-04-10 12:19 ` Alexander Turenko
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 05/13] say: allow to set a logger file descriptor Alexander Turenko
2020-04-10 8:33 ` Cyrill Gorcunov
2020-04-10 12:19 ` Alexander Turenko
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 06/13] popen: decouple logger fd from stderr Alexander Turenko
2020-04-10 9:18 ` Cyrill Gorcunov
2020-04-10 12:20 ` Alexander Turenko
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 07/13] popen: add const qualifier to popen_write_timeout Alexander Turenko
2020-04-10 8:04 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 08/13] popen: unblock popen_read_timeout at a first byte Alexander Turenko
2020-04-10 8:10 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 09/13] popen: remove redundant fd check before perform IO Alexander Turenko
2020-04-10 8:18 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 10/13] popen: add missed diag_set() in popen IO functions Alexander Turenko
2020-04-10 8:28 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 11/13] coio: fix obsoleted comment in coio_write_timeout Alexander Turenko
2020-04-10 8:28 ` Cyrill Gorcunov
2020-04-10 2:50 ` [Tarantool-patches] [PATCH 12/13] coio: add *_noxc read / write functions Alexander Turenko
2020-04-10 8:05 ` Konstantin Osipov
2020-04-10 8:17 ` Cyrill Gorcunov
2020-04-10 11:57 ` Alexander Turenko
2020-04-12 12:51 ` Alexander Turenko
2020-04-10 8:29 ` Cyrill Gorcunov
2020-04-10 2:50 ` Alexander Turenko [this message]
2020-04-10 11:50 ` [Tarantool-patches] [PATCH 13/13] popen: use of exception safe functions for IO Cyrill Gorcunov
2020-04-10 12:21 ` Alexander Turenko
2020-04-10 16:36 ` [Tarantool-patches] [PATCH 00/13] Popen Lua API: preliminary patches Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b2534698431284d8ef9141fc51d3a55989dc1015.1586486220.git.alexander.turenko@tarantool.org \
--to=alexander.turenko@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 13/13] popen: use of exception safe functions for IO' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox