Use waitQueue in userMutex, improve namings

Author: maxdev1

applications/libps2/src/ps2.cpp

@@ -55,24 +55,24 @@ ps2_status_t ps2Initialize(void (*mouseCallback)(int16_t, int16_t, uint8_t, int8
 	g_irq_create_redirect(1, 1);
 	g_irq_create_redirect(12, 12);
 
-	g_create_task_a((void*) &ps2ReadKeyIrq, 0);
-	g_create_task_a((void*) &ps2ReadMouseIrq, 0);
+	g_create_task_a((void*) &ps2AwaitKeyIrq, 0);
+	g_create_task_a((void*) &ps2AwaitMouseIrq, 0);
 	return G_PS2_STATUS_SUCCESS;
 }
 
-void ps2ReadKeyIrq()
+void ps2AwaitKeyIrq()
 {
-	g_task_register_id("libps2/read-key");
+	g_task_register_id("libps2/await-key");
 	for(;;)
 	{
 		g_await_irq_t(1, 50);
 		ps2CheckForData();
 	}
 }
 
-void ps2ReadMouseIrq()
+void ps2AwaitMouseIrq()
 {
-	g_task_register_id("libps2/read-mouse");
+	g_task_register_id("libps2/await-mouse");
 	for(;;)
 	{
 		g_await_irq_t(12, 50);

applications/libps2/src/ps2_intern.hpp

@@ -61,13 +61,13 @@ void ps2HandleMouseData(uint8_t value);
 int ps2WriteToMouse(uint8_t value);
 
 /**
- * Reads IRQs from the key IRQ device.
+ * Awaits IRQs from the key IRQ device.
  */
-void ps2ReadKeyIrq();
+void ps2AwaitKeyIrq();
 
 /**
- * Reads IRQs from the mouse IRQ device.
+ * Awaits IRQs from the mouse IRQ device.
  */
-void ps2ReadMouseIrq();
+void ps2AwaitMouseIrq();
 
 #endif

kernel/src/kernel/calls/syscall_system.cpp

@@ -126,17 +126,17 @@ void syscallAwaitIrq(g_task* task, g_syscall_await_irq* data)
 
 	requestsSetHandlerTask(data->irq, task->id);
 
-	if(data->timeout)
-		clockUnwaitForTime(task->id);
-
 	INTERRUPTS_PAUSE;
 	mutexAcquire(&task->lock);
 	task->status = G_TASK_STATUS_WAITING;
 	task->waitsFor = "irq";
 	mutexRelease(&task->lock);
 
 	if(data->timeout)
+	{
+		clockUnwaitForTime(task->id);
 		clockWaitForTime(task->id, clockGetLocal()->time + data->timeout);
+	}
 
 	taskingYield();
 	INTERRUPTS_RESUME;

kernel/src/kernel/tasking/user_mutex.cpp

@@ -44,7 +44,7 @@ g_user_mutex userMutexCreate(bool reentrant)
 	g_user_mutex_entry* entry = (g_user_mutex_entry*) heapAllocate(sizeof(g_user_mutex_entry));
 	mutexInitializeTask(&entry->lock, __func__);
 	entry->value = 0;
-	entry->waiters = nullptr;
+	waitQueueInitialize(&entry->waiters);
 	entry->reentrant = reentrant;
 	entry->owner = -1;
 
@@ -206,14 +206,7 @@ void userMutexWaitForAcquire(g_user_mutex mutex, g_tid task)
 		return;
 	}
 
-	mutexAcquire(&entry->lock);
-
-	auto waiter = (g_user_mutex_waiter*) heapAllocate(sizeof(g_user_mutex_waiter));
-	waiter->task = task;
-	waiter->next = entry->waiters;
-	entry->waiters = waiter;
-
-	mutexRelease(&entry->lock);
+	waitQueueAdd(&entry->waiters, task);
 }
 
 void userMutexUnwaitForAcquire(g_user_mutex mutex, g_tid task)
@@ -225,41 +218,10 @@ void userMutexUnwaitForAcquire(g_user_mutex mutex, g_tid task)
 		return;
 	}
 
-	mutexAcquire(&entry->lock);
-
-	g_user_mutex_waiter* prev = nullptr;
-	g_user_mutex_waiter* waiter = entry->waiters;
-	while(waiter)
-	{
-		if(waiter->task == task)
-		{
-			auto next = waiter->next;
-			if(prev)
-				prev->next = next;
-			else
-				entry->waiters = next;
-
-			heapFree(waiter);
-			break;
-		}
-		prev = waiter;
-		waiter = waiter->next;
-	}
-
-	mutexRelease(&entry->lock);
+	waitQueueRemove(&entry->waiters, task);
 }
 
 void _userMutexWakeWaitingTasks(g_user_mutex_entry* entry)
 {
-	auto waiter = entry->waiters;
-	while(waiter)
-	{
-		g_task* wakeTask = taskingGetById(waiter->task);
-		taskingWake(wakeTask);
-
-		auto next = waiter->next;
-		heapFree(waiter);
-		waiter = next;
-	}
-	entry->waiters = nullptr;
+	waitQueueWake(&entry->waiters);
 }

kernel/src/kernel/tasking/user_mutex.hpp

@@ -26,12 +26,6 @@
 #include <ghost/tasks/types.h>
 #include <ghost/mutex/types.h>
 
-struct g_user_mutex_waiter
-{
-    g_tid task;
-    g_user_mutex_waiter* next;
-};
-
 struct g_user_mutex_entry
 {
     g_mutex lock;
@@ -40,7 +34,7 @@ struct g_user_mutex_entry
     bool reentrant;
     g_tid owner;
 
-    g_user_mutex_waiter* waiters;
+    g_wait_queue waiters;
 };
 
 typedef uint32_t g_user_mutex_status;