justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[kernel] Have threads return status from wait_on_*

Browse Source 
If the thread waiting is the current thread, it should have the result
when it wakes. Might as well return it, so that syscalls that know
they're putting the current thread to sleep can get the result easily.
This commit is contained in:
Justin C. Miller
2022-02-03 00:06:58 -08:00
parent ad5ebae304
commit 401e662f0b
2 changed files with 69 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/kernel/objects/thread.cpp
View File

@@ -45,49 +45,50 @@ thread::~thread()
thread & thread::current() { return *current_cpu().thread; }
inline void schedule_if_current(thread *t) { if (t == current_cpu().thread) scheduler::get().schedule(); }
void
j6_status_t
thread::wait_on_signals(j6_signal_t signals)
{
{
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::signal;
m_wait_data = signals;
clear_state(state::ready);
}
schedule_if_current(this);
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::signal;
m_wait_data = signals;
lock.release();
block();
return m_wait_result;
}
void
j6_status_t
thread::wait_on_time(uint64_t t)
{
{
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::time;
m_wait_time = t;
clear_state(state::ready);
}
schedule_if_current(this);
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::time;
m_wait_time = t;
lock.release();
block();
return m_wait_result;
}
void
thread::wait_on_object(kobject *o, uint64_t t)
j6_status_t
thread::wait_on_object(void *o, uint64_t t)
{
{
util::scoped_lock lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::object;
m_wait_data = reinterpret_cast<uint64_t>(o);
m_wait_type = wait_type::object;
m_wait_data = reinterpret_cast<uint64_t>(o);
if (t) {
m_wait_type |= wait_type::time;
m_wait_time = t;
}
clear_state(state::ready);
if (t) {
m_wait_type |= wait_type::time;
m_wait_time = t;
}
schedule_if_current(this);
lock.release();
block();
return m_wait_result;
}
bool
@@ -129,7 +130,7 @@ thread::wake_on_time(uint64_t now)
}
bool
thread::wake_on_object(kobject *o)
thread::wake_on_object(void *o, uint64_t id)
{
util::scoped_lock lock {m_wait_lock};
@@ -139,7 +140,7 @@ thread::wake_on_object(kobject *o)
m_wait_type = wait_type::none;
m_wait_result = j6_status_ok;
m_wait_obj = o->koid();
m_wait_obj = id;
set_state(state::ready);
return true;
}
@@ -156,15 +157,27 @@ thread::wake_on_result(kobject *obj, j6_status_t result)
set_state(state::ready);
}
void
thread::block()
{
clear_state(state::ready);
if (current_cpu().thread == this)
scheduler::get().schedule();
}
void
thread::wake()
{
set_state(state::ready);
}
void
thread::exit(int32_t code)
{
m_return_code = code;
set_state(state::exited);
clear_state(state::ready);
close();
schedule_if_current(this);
block();
}
void