From abe2caf6df4cc98e540d9c05b4f2bce14cdedfa4 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 7 Feb 2020 12:30:55 +1100 Subject: py/scheduler: Move clearing of kbd traceback to mp_keyboard_interrupt. This is a more logical place to clear the KeyboardInterrupt traceback, right before it is set as a pending exception. The clearing is also optimised from a function call to a simple store of NULL. --- py/scheduler.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'py') diff --git a/py/scheduler.c b/py/scheduler.c index ca91e42da..eccd9f91b 100644 --- a/py/scheduler.c +++ b/py/scheduler.c @@ -29,7 +29,9 @@ #include "py/runtime.h" #if MICROPY_KBD_EXCEPTION +// This function may be called asynchronously at any time so only do the bare minimum. void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) { + MP_STATE_VM(mp_kbd_exception).traceback_data = NULL; MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)); #if MICROPY_ENABLE_SCHEDULER if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) { -- cgit v1.2.3