[src] Fix the bug of blocking reading of RpcCodec for single socket fd

InfraSail · Aug 25, 2023 · 308fdac · 308fdac
1 parent 51b5c01
commit 308fdac
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/rpc_codec.cc b/src/rpc_codec.cc
@@ -122,8 +122,9 @@ void RpcCodec::OnMessage(int sock_fd, IoBuffer* io_buffer,
  int saved_errno = 0; // FIXME: error check
  const ssize_t min_header_len =
  static_cast<ssize_t>(kMinMessageLength + kHeaderLength);
- while (min_header_len >= io_buffer->GetReadableBytes()) {
- io_buffer->ReadFromFd(sock_fd, min_header_len, &saved_errno);
+ while (min_header_len > io_buffer->GetReadableBytes()) {
+ io_buffer->ReadFromFd(
+ sock_fd, min_header_len - io_buffer->GetReadableBytes(), &saved_errno);
  if (saved_errno != 0) {
  LOG_ERROR("RpcCodec::OnMessage() - Fd(%d) with errno(%d)", sock_fd,
  saved_errno);
@@ -135,9 +136,11 @@ void RpcCodec::OnMessage(int sock_fd, IoBuffer* io_buffer,
  ErrorCode::kInvalidLength);
  return;
  }
- while (static_cast<size_t>(kHeaderLength + len) >=
+ while (static_cast<size_t>(kHeaderLength + len) >
  io_buffer->GetReadableBytes()) {
- io_buffer->ReadFromFd(sock_fd, static_cast<size_t>(kHeaderLength + len),
+ io_buffer->ReadFromFd(sock_fd,
+ static_cast<size_t>(kHeaderLength + len) -
+ io_buffer->GetReadableBytes(),
  &saved_errno);
  }
  if (AsyncRawCallback_ &&