Skip to content

network: fix #15

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 27, 2022
Merged

network: fix #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c0f8ba
network: fix writev
zhxie Oct 27, 2022
e53be18
network: escape cancel first
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
6 changes: 4 additions & 2 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 @@ -138,7 +138,9 @@ Api::IoCallUint64Result IoUringSocketHandleImpl::writev(const Buffer::RawSlice*
uint64_t num_slices_to_write = 0;
for (uint64_t i = 0; i < num_slice; ++i) {
if (slices[i].mem_ != nullptr && slices[i].len_ != 0) {
buffer.add(slices[i].mem_, slices[i].len_);
iov[num_slices_to_write].iov_base = slices[i].mem_;
iov[num_slices_to_write].iov_len = slices[i].len_;
num_slices_to_write++;
}
}

Expand Down Expand Up @@ -458,11 +460,11 @@ void IoUringSocketHandleImpl::FileEventAdapter::onRequestCompletion(const Reques
}
break;
case RequestType::Read: {
ASSERT(req.iohandle_.has_value());
// Read is cancellable.
if (result == -ECANCELED) {
return;
}
ASSERT(req.iohandle_.has_value());
auto& iohandle = req.iohandle_->get();
// This is hacky fix, we should check the req is valid or not.
if (iohandle.fd_ == -1) {
Expand Down