kernel/include/kernel/Lock/Mutex.h

@@ -27,8 +27,6 @@ namespace Kernel
 				while (!m_locker.compare_exchange(-1, tid))
 					Scheduler::get().yield();
 				ASSERT(m_lock_depth == 0);
-				if (Scheduler::current_tid())
-					Thread::current().add_mutex();
 			}
 			m_lock_depth++;
 		}
@@ -43,8 +41,6 @@ namespace Kernel
 				if (!m_locker.compare_exchange(-1, tid))
 					return false;
 				ASSERT(m_lock_depth == 0);
-				if (Scheduler::current_tid())
-					Thread::current().add_mutex();
 			}
 			m_lock_depth++;
 			return true;
@@ -55,11 +51,7 @@ namespace Kernel
 			ASSERT(m_locker == Scheduler::current_tid());
 			ASSERT(m_lock_depth > 0);
 			if (--m_lock_depth == 0)
-			{
 				m_locker = -1;
-				if (Scheduler::current_tid())
-					Thread::current().remove_mutex();
-			}
 		}
 
 		pid_t locker() const { return m_locker; }
@@ -92,8 +84,6 @@ namespace Kernel
 				while (!(has_priority || m_queue_length == 0) || !m_locker.compare_exchange(-1, tid))
 					Scheduler::get().yield();
 				ASSERT(m_lock_depth == 0);
-				if (Scheduler::current_tid())
-					Thread::current().add_mutex();
 			}
 			m_lock_depth++;
 		}
@@ -111,8 +101,6 @@ namespace Kernel
 				if (has_priority)
 					m_queue_length++;
 				ASSERT(m_lock_depth == 0);
-				if (Scheduler::current_tid())
-					Thread::current().add_mutex();
 			}
 			m_lock_depth++;
 			return true;
@@ -129,8 +117,6 @@ namespace Kernel
 				if (has_priority)
 					m_queue_length--;
 				m_locker = -1;
-				if (Scheduler::current_tid())
-					Thread::current().remove_mutex();
 			}
 		}
 

kernel/include/kernel/Thread.h

@@ -38,8 +38,9 @@ namespace Kernel
 		void setup_exec();
 		void setup_process_cleanup();
 
-		// Returns true, if thread is going to trigger signal
-		bool is_interrupted_by_signal() const;
+		// Adds pending signals to thread if possible and
+		// returns true, if thread is going to trigger signal
+		bool is_interrupted_by_signal();
 
 		// Returns true if pending signal can be added to thread
 		bool can_add_signal_to_execute() const;
@@ -85,9 +86,6 @@ namespace Kernel
 		static Thread* sse_thread();
 #endif
 
-		void add_mutex() { m_mutex_count++; }
-		void remove_mutex() { m_mutex_count--; }
-
 	private:
 		Thread(pid_t tid, Process*);
 
@@ -113,8 +111,6 @@ namespace Kernel
 		SpinLock					m_signal_lock;
 		static_assert(_SIGMAX < 64);
 
-		BAN::Atomic<uint32_t>		m_mutex_count { 0 };
-
 #if __enable_sse
 		alignas(16) uint8_t m_sse_storage[512] {};
 #endif

kernel/kernel/Thread.cpp

@@ -272,7 +272,14 @@ namespace Kernel
 		memset(&m_interrupt_registers, 0, sizeof(InterruptRegisters));
 	}
 
-	bool Thread::is_interrupted_by_signal() const
+	bool Thread::is_interrupted_by_signal()
+	{
+		while (can_add_signal_to_execute())
+			handle_signal();
+		return will_execute_signal();
+	}
+
+	bool Thread::can_add_signal_to_execute() const
 	{
 		if (!is_userspace() || m_state != State::Executing)
 			return false;
@@ -283,11 +290,6 @@ namespace Kernel
 		return full_pending_mask & ~m_signal_block_mask;
 	}
 
-	bool Thread::can_add_signal_to_execute() const
-	{
-		return is_interrupted_by_signal() && m_mutex_count == 0;
-	}
-
 	bool Thread::will_execute_signal() const
 	{
 		if (!is_userspace() || m_state != State::Executing)