RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:38:11 +00:00
Code Issues Activity Actions

Net: Simplify how LocalSocket tracks open fds

Browse source 
Now that there can't be multiple clones of the same fd,
we only need to track whether or not an fd exists on each
side. Also there's no point in tracking connecting fds.
This commit is contained in:
Sergey Bugaev 2019-08-11 16:28:18 +03:00 • committed by Andreas Kling
parent 1606261c58
commit d46c3b0b5b
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Kernel/Net/LocalSocket.cpp
View file

@ -131,16 +131,17 @@ KResult LocalSocket::listen(int backlog)
void LocalSocket::attach(FileDescription& description)
{
ASSERT(!m_accept_side_fd_open);
switch (description.socket_role()) {
case SocketRole::None:
ASSERT(!m_connect_side_fd_open);
m_connect_side_fd_open = true;
break;
case SocketRole::Accepted:
++m_accepted_fds_open;
m_accept_side_fd_open = true;
break;
case SocketRole::Connected:
++m_connected_fds_open;
break;
case SocketRole::Connecting:
++m_connecting_fds_open;
break;
ASSERT_NOT_REACHED();
default:
break;
}
@ -149,17 +150,18 @@ void LocalSocket::attach(FileDescription& description)
void LocalSocket::detach(FileDescription& description)
{
switch (description.socket_role()) {
case SocketRole::None:
ASSERT(!m_accept_side_fd_open);
ASSERT(m_connect_side_fd_open);
m_connect_side_fd_open = false;
break;
case SocketRole::Accepted:
ASSERT(m_accepted_fds_open);
--m_accepted_fds_open;
ASSERT(m_accept_side_fd_open);
m_accept_side_fd_open = false;
break;
case SocketRole::Connected:
ASSERT(m_connected_fds_open);
--m_connected_fds_open;
break;
case SocketRole::Connecting:
ASSERT(m_connecting_fds_open);
--m_connecting_fds_open;
ASSERT(m_connect_side_fd_open);
m_connect_side_fd_open = false;
break;
default:
break;
@ -181,9 +183,9 @@ bool LocalSocket::can_read(FileDescription& description) const
bool LocalSocket::has_attached_peer(const FileDescription& description) const
{
if (description.socket_role() == SocketRole::Accepted)
return m_connected_fds_open || m_connecting_fds_open;
return m_connect_side_fd_open;
if (description.socket_role() == SocketRole::Connected)
return m_accepted_fds_open;
return m_accept_side_fd_open;
ASSERT_NOT_REACHED();
}