RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:38:11 +00:00
Code Issues Activity Actions

Kernel: Replace "current" with Thread::current and Process::current

Browse source 
Suggested by Sergey. The currently running Thread and Process are now
Thread::current and Process::current respectively. :^)
This commit is contained in:
Andreas Kling 2020-02-17 15:04:27 +01:00
parent 4f4af24b9d
commit 48f7c28a5c
37 changed files with 257 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Lock.cpp
View file

@ -41,13 +41,13 @@ void Lock::lock()
for (;;) {
bool expected = false;
if (m_lock.compare_exchange_strong(expected, true, AK::memory_order_acq_rel)) {
if (!m_holder || m_holder == current) {
m_holder = current;
if (!m_holder || m_holder == Thread::current) {
m_holder = Thread::current;
++m_level;
m_lock.store(false, AK::memory_order_release);
return;
}
current->wait_on(m_queue, &m_lock, m_holder, m_name);
Thread::current->wait_on(m_queue, &m_lock, m_holder, m_name);
}
}
}
@ -57,7 +57,7 @@ void Lock::unlock()
for (;;) {
bool expected = false;
if (m_lock.compare_exchange_strong(expected, true, AK::memory_order_acq_rel)) {
ASSERT(m_holder == current);
ASSERT(m_holder == Thread::current);
ASSERT(m_level);
--m_level;
if (m_level) {
@ -76,10 +76,10 @@ void Lock::unlock()
bool Lock::force_unlock_if_locked()
{
InterruptDisabler disabler;
if (m_holder != current)
if (m_holder != Thread::current)
return false;
ASSERT(m_level == 1);
ASSERT(m_holder == current);
ASSERT(m_holder == Thread::current);
m_holder = nullptr;
--m_level;
m_queue.wake_one();