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

Merge pull request #6717 from hasumikin/fix/Task-critical-section

Browse Source 
Fix mruby-task: wrapping by critical section and setting initial task receiver to top_self
This commit is contained in:
Yukihiro "Matz" Matsumoto
2026-02-14 10:09:43 +09:00
committed by GitHub
parent 0bc0700fa4 40d6e2e9a4
commit 6d04ae695d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-task/src/task.c
+11 -8
View File
@@ -278,8 +278,8 @@ task_init_context(mrb_state *mrb, mrb_task *t, const struct RProc *proc)
}
}
/* Copy receiver from current context */
c->stbase[0] = mrb->c->ci->stack[0];
/* Set receiver to top self */
c->stbase[0] = mrb_top_self(mrb);
/* Initialize callinfo stack */
static const mrb_callinfo ci_zero = { 0 };
@@ -459,13 +459,16 @@ mrb_task_run(mrb_state *mrb)
/* No task ready - check if all tasks are done */
if (!t) {
/* If there are tasks waiting or suspended, idle */
if (q_waiting_ || q_suspended_) {
mrb_hal_task_idle_cpu(mrb);
continue;
mrb_task_disable_irq();
mrb_bool exiting = !q_ready_ && !q_waiting_ && !q_suspended_;
mrb_task_enable_irq();
if (exiting) {
/* All tasks are dormant - scheduler done */
break;
}
/* All tasks are dormant - scheduler done */
break;
/* If there are tasks waiting or suspended, idle */
mrb_hal_task_idle_cpu(mrb);
continue;
}
/* Safety check - don't execute terminated tasks */