RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:47:35 +00:00
Code Issues Activity Actions

Kernel: Convert process file descriptor table to a SpinlockProtected

Browse source 
Instead of manually locking in the various member functions of
Process::OpenFileDescriptions, simply wrap it in a SpinlockProtected.
This commit is contained in:
Andreas Kling 2022-01-29 01:22:28 +01:00
parent 93e90e16c3
commit 8ebec2938c
30 changed files with 257 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/Syscalls/sendfd.cpp
View file

@ -14,7 +14,7 @@ ErrorOr<FlatPtr> Process::sys$sendfd(int sockfd, int fd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
TRY(require_promise(Pledge::sendfd));
auto socket_description = TRY(fds().open_file_description(sockfd));
auto socket_description = TRY(open_file_description(sockfd));
if (!socket_description->is_socket())
return ENOTSOCK;
auto& socket = *socket_description->socket();
@ -23,7 +23,7 @@ ErrorOr<FlatPtr> Process::sys$sendfd(int sockfd, int fd)
if (!socket.is_connected())
return ENOTCONN;
auto passing_description = TRY(fds().open_file_description(fd));
auto passing_description = TRY(open_file_description(fd));
auto& local_socket = static_cast<LocalSocket&>(socket);
TRY(local_socket.sendfd(*socket_description, move(passing_description)));
return 0;
@ -33,14 +33,14 @@ ErrorOr<FlatPtr> Process::sys$recvfd(int sockfd, int options)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
TRY(require_promise(Pledge::recvfd));
auto socket_description = TRY(fds().open_file_description(sockfd));
auto socket_description = TRY(open_file_description(sockfd));
if (!socket_description->is_socket())
return ENOTSOCK;
auto& socket = *socket_description->socket();
if (!socket.is_local())
return EAFNOSUPPORT;
auto fd_allocation = TRY(m_fds.allocate());
auto fd_allocation = TRY(m_fds.with([](auto& fds) { return fds.allocate(); }));
auto& local_socket = static_cast<LocalSocket&>(socket);
auto received_description = TRY(local_socket.recvfd(*socket_description));
@ -49,7 +49,7 @@ ErrorOr<FlatPtr> Process::sys$recvfd(int sockfd, int options)
if (options & O_CLOEXEC)
fd_flags |= FD_CLOEXEC;
m_fds[fd_allocation.fd].set(move(received_description), fd_flags);
m_fds.with([&](auto& fds) { fds[fd_allocation.fd].set(move(received_description), fd_flags); });
return fd_allocation.fd;
}