join: Only continue if joinee finished

hermit-os · Jun 20, 2023 · 51ef3d0 · 51ef3d0
1 parent 2350c5b
commit 51ef3d0
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/scheduler/mod.rs b/src/scheduler/mod.rs
@@ -757,22 +757,20 @@ pub fn join(id: TaskId) -> Result<(), ()> {
 		id
 	);
 
-	{
-		match WAITING_TASKS.lock().get_mut(&id) {
-			Some(queue) => {
-				queue.push_back(core_scheduler.get_current_task_handle());
-				core_scheduler.block_current_task(None);
-			}
-			_ => {
-				return Ok(());
-			}
+	loop {
+		let mut waiting_tasks_guard = WAITING_TASKS.lock();
+
+		if let Some(queue) = waiting_tasks_guard.get_mut(&id) {
+			queue.push_back(core_scheduler.get_current_task_handle());
+			core_scheduler.block_current_task(None);
+
+			// Switch to the next task.
+			drop(waiting_tasks_guard);
+			core_scheduler.reschedule();
+		} else {
+			return Ok(());
 		}
 	}
-
-	// Switch to the next task.
-	core_scheduler.reschedule();
-
-	Ok(())
 }
 
 fn get_task_handle(id: TaskId) -> Option<TaskHandle> {