This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 98c0f66 PROTON-2482: Fix PROTON-2479 to correctly handle
EOF/EWOULDBLOCK
98c0f66 is described below
commit 98c0f661c270712d7059e70e5a4f0f53b3a9b1bc
Author: Andrew Stitcher <[email protected]>
AuthorDate: Tue Jan 11 09:51:06 2022 -0500
PROTON-2482: Fix PROTON-2479 to correctly handle EOF/EWOULDBLOCK
The previous code didn't handle any exception cases in the additional
potential second read.
---
c/src/proactor/epoll.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index adce8cd..3784d05 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -1215,26 +1215,34 @@ static pn_event_batch_t
*pconnection_process(pconnection_t *pc, uint32_t events,
if (n > 0) {
pn_connection_driver_read_done(&pc->driver, n);
// If n == rbuf.size then we should enlarge the buffer and see if
there is more to read
- if (n==(ssize_t)rbuf.size) {
+ if ((size_t)n==rbuf.size) {
rbuf = pn_connection_driver_read_buffer_sized(&pc->driver, n*2);
- n = read(pc->psocket.epoll_io.fd, rbuf.start, rbuf.size);
- pn_connection_driver_read_done(&pc->driver, n);
+ if (rbuf.size > 0) {
+ n = read(pc->psocket.epoll_io.fd, rbuf.start, rbuf.size);
+ if (n > 0) {
+ pn_connection_driver_read_done(&pc->driver, n);
+ }
+ }
+ }
+ // If we didn't read a full buffer (either in the first or second
read) then we are blocked
+ if ((size_t)n < rbuf.size &&
!pn_connection_driver_read_closed(&pc->driver)) {
+ pc->read_blocked = true;
}
pc->output_drained = false;
pconnection_tick(pc); /* check for tick changes. */
tick_required = false;
pc->io_doublecheck = false;
- if (!pn_connection_driver_read_closed(&pc->driver) && (size_t)n <
rbuf.size)
- pc->read_blocked = true;
}
- else if (n == 0) {
+ // Need to check for EOF and errors for either read
+ if (n == 0) {
pc->read_blocked = true;
pn_connection_driver_read_close(&pc->driver);
- }
- else if (errno == EWOULDBLOCK)
- pc->read_blocked = true;
- else if (!(errno == EAGAIN || errno == EINTR)) {
- psocket_error(&pc->psocket, errno, pc->disconnected ? "disconnected" :
"on read from");
+ } else if (n < 0) {
+ if (errno == EWOULDBLOCK) {
+ pc->read_blocked = true;
+ } else if (!(errno == EAGAIN || errno == EINTR)) {
+ psocket_error(&pc->psocket, errno, pc->disconnected ? "disconnected"
: "on read from");
+ }
}
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
