diff options
Diffstat (limited to 'Kernel/Process.cpp')
| -rw-r--r-- | Kernel/Process.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 9d6eee3c4e..a8c3ae659e 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -869,7 +869,7 @@ ssize_t Process::sys$writev(int fd, const struct iovec* iov, int iov_count) } if (current->has_unmasked_pending_signals()) { - current->block(*new Thread::SemiPermanentBlocker(Thread::SemiPermanentBlocker::Reason::Signal)); + current->block<Thread::SemiPermanentBlocker>(Thread::SemiPermanentBlocker::Reason::Signal); if (nwritten == 0) return -EINTR; } @@ -900,7 +900,7 @@ ssize_t Process::do_write(FileDescription& description, const u8* data, int data #ifdef IO_DEBUG dbgprintf("block write on %d\n", fd); #endif - current->block(*new Thread::WriteBlocker(description)); + current->block<Thread::WriteBlocker>(description); } ssize_t rc = description.write(data + nwritten, data_size - nwritten); #ifdef IO_DEBUG @@ -914,7 +914,7 @@ ssize_t Process::do_write(FileDescription& description, const u8* data, int data if (rc == 0) break; if (current->has_unmasked_pending_signals()) { - current->block(*new Thread::SemiPermanentBlocker(Thread::SemiPermanentBlocker::Reason::Signal)); + current->block<Thread::SemiPermanentBlocker>(Thread::SemiPermanentBlocker::Reason::Signal); if (nwritten == 0) return -EINTR; } @@ -939,7 +939,7 @@ ssize_t Process::sys$write(int fd, const u8* data, ssize_t size) return -EBADF; auto nwritten = do_write(*description, data, size); if (current->has_unmasked_pending_signals()) { - current->block(*new Thread::SemiPermanentBlocker(Thread::SemiPermanentBlocker::Reason::Signal)); + current->block<Thread::SemiPermanentBlocker>(Thread::SemiPermanentBlocker::Reason::Signal); if (nwritten == 0) return -EINTR; } @@ -962,7 +962,7 @@ ssize_t Process::sys$read(int fd, u8* buffer, ssize_t size) return -EBADF; if (description->is_blocking()) { if (!description->can_read()) { - current->block(*new Thread::ReadBlocker(*description)); + current->block<Thread::ReadBlocker>(*description); if (current->m_was_interrupted_while_blocked) return -EINTR; } @@ -1265,7 +1265,7 @@ int Process::sys$kill(pid_t pid, int signal) } if (pid == m_pid) { current->send_signal(signal, this); - current->block(*new Thread::SemiPermanentBlocker(Thread::SemiPermanentBlocker::Reason::Signal)); + current->block<Thread::SemiPermanentBlocker>(Thread::SemiPermanentBlocker::Reason::Signal); return 0; } InterruptDisabler disabler; @@ -1442,7 +1442,7 @@ pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options) } pid_t waitee_pid = waitee; - current->block(*new Thread::WaitBlocker(options, waitee_pid)); + current->block<Thread::WaitBlocker>(options, waitee_pid); if (current->m_was_interrupted_while_blocked) return -EINTR; @@ -1827,7 +1827,7 @@ int Process::sys$select(const Syscall::SC_select_params* params) #endif if (!params->timeout || select_has_timeout) - current->block(*new Thread::SelectBlocker(timeout, select_has_timeout, rfds, wfds, efds)); + current->block<Thread::SelectBlocker>(timeout, select_has_timeout, rfds, wfds, efds); int marked_fd_count = 0; auto mark_fds = [&](auto* fds, auto& vector, auto should_mark) { @@ -1882,7 +1882,7 @@ int Process::sys$poll(pollfd* fds, int nfds, int timeout) #endif if (has_timeout|| timeout < 0) - current->block(*new Thread::SelectBlocker(actual_timeout, has_timeout, rfds, wfds, Thread::SelectBlocker::FDVector())); + current->block<Thread::SelectBlocker>(actual_timeout, has_timeout, rfds, wfds, Thread::SelectBlocker::FDVector()); int fds_with_revents = 0; @@ -2125,7 +2125,7 @@ int Process::sys$accept(int accepting_socket_fd, sockaddr* address, socklen_t* a auto& socket = *accepting_socket_description->socket(); if (!socket.can_accept()) { if (accepting_socket_description->is_blocking()) { - current->block(*new Thread::AcceptBlocker(*accepting_socket_description)); + current->block<Thread::AcceptBlocker>(*accepting_socket_description); if (current->m_was_interrupted_while_blocked) return -EINTR; } else { |