0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

LibCore: Implement LocalSocket::read_without_waiting

Browse source 
This uses recv with MSG_DONTWAIT to disable blocking operation for a
single call. LibIPC uses this to read in a non-blocking manner from an
otherwise blocking socket.
This commit is contained in:
sin-ack 2022-01-14 13:22:54 +00:00 • committed by Ali Mohammad Pur
parent f9847372f3
commit 27b49a60d0
Notes: sideshowbarker 2024-07-17 20:52:31 +09:00
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibCore/Stream.cpp
View file

@ -341,15 +341,15 @@ ErrorOr<void> Socket::connect_inet(int fd, SocketAddress const& address)
return {};
}
ErrorOr<size_t> PosixSocketHelper::read(Bytes buffer)
ErrorOr<size_t> PosixSocketHelper::read(Bytes buffer, int flags)
{
if (!is_open()) {
return Error::from_errno(ENOTCONN);
}
ssize_t rc = ::recv(m_fd, buffer.data(), buffer.size(), 0);
ssize_t rc = ::recv(m_fd, buffer.data(), buffer.size(), flags);
if (rc < 0) {
return Error::from_errno(errno);
return Error::from_syscall("recv", -errno);
}
m_last_read_was_eof = rc == 0;
@ -556,4 +556,9 @@ ErrorOr<void> LocalSocket::send_fd(int fd)
#endif
}
ErrorOr<size_t> LocalSocket::read_without_waiting(Bytes buffer)
{
return m_helper.read(buffer, MSG_DONTWAIT);
}
}

3
Userland/Libraries/LibCore/Stream.h
View file

@ -229,7 +229,7 @@ public:
int fd() const { return m_fd; }
void set_fd(int fd) { m_fd = fd; }
ErrorOr<size_t> read(Bytes);
ErrorOr<size_t> read(Bytes, int flags = 0);
ErrorOr<size_t> write(ReadonlyBytes);
bool is_eof() const { return !is_open() || m_last_read_was_eof; }
@ -412,6 +412,7 @@ public:
ErrorOr<int> receive_fd(int flags);
ErrorOr<void> send_fd(int fd);
ErrorOr<size_t> read_without_waiting(Bytes buffer);
virtual ~LocalSocket() { close(); }