Skip to content

network: add read request when read or connect #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soulxu merged 2 commits into from
Oct 31, 2022
Merged

network: add read request when read or connect #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12be365
network: delay read request
zhxie Oct 27, 2022
7a5b91d
network: add read request after connect
zhxie Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions source/common/network/io_uring_socket_handle_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ Api::IoCallUint64Result IoUringSocketHandleImpl::close() {
}

bool IoUringSocketHandleImpl::isOpen() const { return SOCKET_VALID(fd_); }

Api::IoCallUint64Result IoUringSocketHandleImpl::readv(uint64_t /* max_length */,
Buffer::RawSlice* slices,
uint64_t num_slice) {
if (read_buf_ == nullptr) {
if (bytes_to_read_ == 0 || read_buf_ == nullptr) {
addReadRequest();
return {0, Api::IoErrorPtr(IoSocketError::getIoSocketEagainInstance(),
IoSocketError::deleteIoError)};
}
Expand Down Expand Up @@ -105,6 +107,7 @@ Api::IoCallUint64Result IoUringSocketHandleImpl::read(Buffer::Instance& buffer,
}

if (bytes_to_read_ == 0 || read_buf_ == nullptr) {
addReadRequest();
return {0, Api::IoErrorPtr(IoSocketError::getIoSocketEagainInstance(),
IoSocketError::deleteIoError)};
}
Expand Down Expand Up @@ -157,9 +160,6 @@ Api::IoCallUint64Result IoUringSocketHandleImpl::writev(const Buffer::RawSlice*
}
// Need to ensure the write request submitted.
uring.submit();
// Make the IO handle start reading to avoid read timeout in procedures out of Envoy's scope
// including handshaking of TLS.
addReadRequest();
}

if (bytes_to_write_ == 0) {
Expand Down Expand Up @@ -482,11 +482,18 @@ void IoUringSocketHandleImpl::FileEventAdapter::onRequestCompletion(const Reques
}
break;
}
case RequestType::Connect:
case RequestType::Connect: {
ASSERT(req.iohandle_.has_value());
req.iohandle_->get().cb_(result < 0 ? Event::FileReadyType::Closed
: Event::FileReadyType::Write);
auto& iohandle = req.iohandle_->get();
if (result < 0) {
iohandle.cb_(Event::FileReadyType::Closed);
break;
}

iohandle.cb_(Event::FileReadyType::Write);
iohandle.addReadRequest();
break;
}
case RequestType::Write: {
ASSERT(req.iohandle_.has_value());
auto& iohandle = req.iohandle_->get();
Expand Down