TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

lib/utils: Lock the scheduler when executing hard callback functions.

Browse Source 
Otherwise scheduled functions may execute during the hard callback and then
fail if they try to allocate heap memory.
This commit is contained in:
Damien George
2020-05-27 17:53:31 +10:00
parent d6803067c0
commit 4bbba3060d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils/mpirq.c
View File

@@ -62,8 +62,10 @@ mp_irq_obj_t *mp_irq_new(const mp_irq_methods_t *methods, mp_obj_t parent) {
void mp_irq_handler(mp_irq_obj_t *self) { void mp_irq_handler(mp_irq_obj_t *self) {
if (self->handler != mp_const_none) { if (self->handler != mp_const_none) {
if (self->ishard) { if (self->ishard) {
// When executing code within a handler we must lock the GC to prevent // When executing code within a handler we must lock the scheduler to
// any memory allocations. // prevent any scheduled callbacks from running, and lock the GC to
// prevent any memory allocations.
mp_sched_lock();
gc_lock(); gc_lock();
nlr_buf_t nlr; nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
@@ -77,6 +79,7 @@ void mp_irq_handler(mp_irq_obj_t *self) {
mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val)); mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
} }
gc_unlock(); gc_unlock();
mp_sched_unlock();
} else { } else {
// Schedule call to user function // Schedule call to user function
mp_sched_schedule(self->handler, self->parent); mp_sched_schedule(self->handler, self->parent);