summaryrefslogtreecommitdiffstatshomepage
path: root/py/scheduler.c
diff options
context:
space:
mode:
Diffstat (limited to 'py/scheduler.c')
-rw-r--r--py/scheduler.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/py/scheduler.c b/py/scheduler.c
index 3eae8b4fa3..2170b9577e 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -236,7 +236,13 @@ void mp_handle_pending(bool raise_exc) {
// Handle any pending callbacks.
#if MICROPY_ENABLE_SCHEDULER
- if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
+ bool run_scheduler = (MP_STATE_VM(sched_state) == MP_SCHED_PENDING);
+ #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
+ // Avoid races by running the scheduler on the main thread, only.
+ // (Not needed if GIL enabled, as GIL ensures thread safety here.)
+ run_scheduler = run_scheduler && mp_thread_is_main_thread();
+ #endif
+ if (run_scheduler) {
mp_sched_run_pending();
}
#endif