Kernel: Add SYS_WAIT
This syscall waits for a given pid.
This commit is contained in:
@@ -117,6 +117,15 @@ namespace Kernel
|
||||
void Process::exit()
|
||||
{
|
||||
m_lock.lock();
|
||||
m_exit_status.exited = true;
|
||||
while (m_exit_status.waiting > 0)
|
||||
{
|
||||
m_exit_status.semaphore.unblock();
|
||||
m_lock.unlock();
|
||||
// TODO: add proper software reschedule
|
||||
Scheduler::get().set_current_thread_sleeping(0);
|
||||
}
|
||||
m_lock.lock();
|
||||
|
||||
m_threads.clear();
|
||||
for (auto& open_fd : m_open_files)
|
||||
@@ -249,6 +258,52 @@ namespace Kernel
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
|
||||
int Process::block_until_exit()
|
||||
{
|
||||
ASSERT(s_process_lock.is_locked());
|
||||
ASSERT(this != &Process::current());
|
||||
|
||||
s_process_lock.unlock();
|
||||
|
||||
m_lock.lock();
|
||||
m_exit_status.waiting++;
|
||||
while (!m_exit_status.exited)
|
||||
{
|
||||
m_lock.unlock();
|
||||
m_exit_status.semaphore.block();
|
||||
m_lock.lock();
|
||||
}
|
||||
|
||||
int ret = m_exit_status.exit_code;
|
||||
m_exit_status.waiting--;
|
||||
m_lock.unlock();
|
||||
|
||||
s_process_lock.lock();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
BAN::ErrorOr<pid_t> Process::wait(pid_t pid, int* stat_loc, int options)
|
||||
{
|
||||
Process* target = nullptr;
|
||||
|
||||
// FIXME: support options
|
||||
if (options)
|
||||
return BAN::Error::from_errno(EINVAL);
|
||||
|
||||
LockGuard _(s_process_lock);
|
||||
for (auto* process : s_processes)
|
||||
if (process->pid() == pid)
|
||||
target = process;
|
||||
|
||||
if (target == nullptr)
|
||||
return BAN::Error::from_errno(ECHILD);
|
||||
|
||||
pid_t ret = target->pid();
|
||||
*stat_loc = target->block_until_exit();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void Process::load_elf(LibELF::ELF& elf)
|
||||
{
|
||||
|
||||
@@ -120,6 +120,14 @@ namespace Kernel
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
|
||||
long sys_wait(pid_t pid, int* stat_loc, int options)
|
||||
{
|
||||
auto ret = Process::current().wait(pid, stat_loc, options);
|
||||
if (ret.is_error())
|
||||
return -ret.error().get_error_code();
|
||||
return ret.value();
|
||||
}
|
||||
|
||||
extern "C" long sys_fork_trampoline();
|
||||
|
||||
extern "C" long cpp_syscall_handler(int syscall, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5)
|
||||
@@ -182,6 +190,9 @@ namespace Kernel
|
||||
case SYS_EXEC:
|
||||
ret = sys_exec((const char*)arg1, (const char* const*)arg2, (const char* const*)arg3);
|
||||
break;
|
||||
case SYS_WAIT:
|
||||
ret = sys_wait((pid_t)arg1, (int*)arg2, (int)arg3);
|
||||
break;
|
||||
default:
|
||||
Kernel::panic("Unknown syscall {}", syscall);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user