From 2ebbb087662208cc209dfcb0ba41d3662a738764 Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Fri, 21 Apr 2023 21:48:07 +0300 Subject: [PATCH] [Mutex] Make less dumb --- include/kernel/kernel_types.hpp | 2 +- src/core/kernel/threads.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp index 927e2a3a..c7a5e26e 100644 --- a/include/kernel/kernel_types.hpp +++ b/include/kernel/kernel_types.hpp @@ -177,7 +177,7 @@ struct Mutex { u32 lockCount; // Number of times this mutex has been locked by its daddy. 0 = not locked bool locked; - Mutex(bool lock = false) : locked(lock), waitlist(0), lockCount(0) {} + Mutex(bool lock = false) : locked(lock), waitlist(0), lockCount(lock ? 1 : 0) {} }; struct Semaphore { diff --git a/src/core/kernel/threads.cpp b/src/core/kernel/threads.cpp index 9c9608b8..c796fa1f 100644 --- a/src/core/kernel/threads.cpp +++ b/src/core/kernel/threads.cpp @@ -169,7 +169,6 @@ Handle Kernel::makeMutex(bool locked) { if (locked) { Mutex* moo = objects[ret].getData(); moo->ownerThread = currentThreadIndex; - moo->lockCount = 1; } return ret;