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] Fix thread-wait scoped lock scoping bug

Browse Source 
A spinlock was recenly added to thread wait states, so that they
couldn't get stuck if their wake event happened while setting the wake
state, and cause the thread to deadlock. But the scoped_lock objects
locking that spinlock were being instantiated as temporaries and
immediately being thrown away because I forgot to name them.
This commit is contained in:
Justin C. Miller
2022-01-23 00:32:06 -08:00
parent cbd2d9d625
commit 75e7fe941b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ void
thread::wait_on_signals(j6_signal_t signals)
{
{
util::scoped_lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::signal;
m_wait_data = signals;
clear_state(state::ready);
@@ -63,7 +63,7 @@ void
thread::wait_on_time(uint64_t t)
{
{
util::scoped_lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::time;
m_wait_time = t;
clear_state(state::ready);
@@ -75,7 +75,7 @@ void
thread::wait_on_object(kobject *o, uint64_t t)
{
{
util::scoped_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);
@@ -93,7 +93,7 @@ thread::wait_on_object(kobject *o, uint64_t t)
bool
thread::wake_on_signals(kobject *obj, j6_signal_t signals)
{
util::scoped_lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
if (!(m_wait_type & wait_type::signal) ||
(signals & m_wait_data) == 0)
@@ -110,7 +110,7 @@ thread::wake_on_signals(kobject *obj, j6_signal_t signals)
bool
thread::wake_on_time(uint64_t now)
{
util::scoped_lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
if (!(m_wait_type & wait_type::time) ||
now < m_wait_time)
@@ -131,7 +131,7 @@ thread::wake_on_time(uint64_t now)
bool
thread::wake_on_object(kobject *o)
{
util::scoped_lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
if (!(m_wait_type & wait_type::object) ||
reinterpret_cast<uint64_t>(o) != m_wait_data)
@@ -147,7 +147,7 @@ thread::wake_on_object(kobject *o)
void
thread::wake_on_result(kobject *obj, j6_status_t result)
{
util::scoped_lock {m_wait_lock};
util::scoped_lock lock {m_wait_lock};
m_wait_type = wait_type::none;
m_wait_result = result;