admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mruby-task: keep join waiter wakeup under one IRQ critical section

Browse Source
This commit is contained in:
HASUMI Hitoshi
2026-05-18 15:42:58 +09:00
parent d1bffb902e
commit c4d205496d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-task/src/task.c
+10 -2
View File
@@ -305,20 +305,28 @@ task_init_context(mrb_state *mrb, mrb_task *t, const struct RProc *proc)
static void
wake_up_join_waiters(mrb_state *mrb, mrb_task *completed_task)
{
mrb_task_disable_irq();
mrb_task *curr = q_waiting_;
while (curr != NULL) {
mrb_task *next = curr->next;
if (curr->reason == MRB_TASK_REASON_JOIN && curr->wait.join == completed_task) {
mrb_task_disable_irq();
q_delete_task(mrb, curr);
curr->status = MRB_TASK_STATUS_READY;
curr->reason = MRB_TASK_REASON_NONE;
curr->wait.join = NULL;
q_insert_task(mrb, curr);
mrb_task_enable_irq();
/* If a higher-priority waiter is resumed from task context,
* request a context switch after leaving the critical section. */
if (mrb->c != mrb->root_c && !switching_) {
mrb_task *running = MRB2TASK(mrb);
if (curr->priority < running->priority) {
switching_ = TRUE;
}
}
}
curr = next;
}
mrb_task_enable_irq();
}
/* Change task state with IRQ protection and queue management */