Skip to content

network: fix write result handling #17

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 1 commit into from
Oct 31, 2022
Merged

network: fix write result handling #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 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 @@ -133,6 +133,12 @@ Api::IoCallUint64Result IoUringSocketHandleImpl::writev(const Buffer::RawSlice*
return {0, Api::IoErrorPtr(new IoSocketError(bytes_to_read_), IoSocketError::deleteIoError)};
}

if (bytes_to_write_ > 0) {
uint64_t len = bytes_to_write_;
bytes_to_write_ = 0;
return {len, Api::IoErrorPtr(nullptr, IoSocketError::deleteIoError)};
}

struct iovec* iovecs = new struct iovec[num_slice];
struct iovec* iov = iovecs;
uint64_t num_slices_to_write = 0;
Expand Down Expand Up @@ -162,14 +168,8 @@ Api::IoCallUint64Result IoUringSocketHandleImpl::writev(const Buffer::RawSlice*
addReadRequest();
}

if (bytes_to_write_ == 0) {
return {0, Api::IoErrorPtr(IoSocketError::getIoSocketEagainInstance(),
IoSocketError::deleteIoError)};
}

uint64_t len = bytes_to_write_;
bytes_to_write_ = 0;
return {len, Api::IoErrorPtr(nullptr, IoSocketError::deleteIoError)};
return {
0, Api::IoErrorPtr(IoSocketError::getIoSocketEagainInstance(), IoSocketError::deleteIoError)};
}

Api::IoCallUint64Result IoUringSocketHandleImpl::write(Buffer::Instance& buffer) {
Expand Down