py/scheduler: Move clearing of kbd traceback to mp_keyboard_interrupt.

dpgeorge · dpgeorge · commit abe2caf6df4c · 2020-02-07T16:08:31.000+11:00
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.
diff --git a/lib/utils/interrupt_char.c b/lib/utils/interrupt_char.c
@@ -32,9 +32,6 @@
 int mp_interrupt_char = -1;
 
 void mp_hal_set_interrupt_char(int c) {
-    if (c != -1) {
-        mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
-    }
     mp_interrupt_char = c;
 }
 
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
@@ -39,9 +39,6 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
 }
 
 void mp_hal_set_interrupt_char(int c) {
-    if (c != -1) {
-        mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
-    }
     tud_cdc_set_wanted_char(c);
 }
 
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@`
`32`	`32`	`int mp_interrupt_char = -1;`
`33`	`33`
`34`	`34`	`void mp_hal_set_interrupt_char(int c) {`
`35`		`- if (c != -1) {`
`36`		`- mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));`
`37`		`- }`
`38`	`35`	`mp_interrupt_char = c;`
`39`	`36`	`}`
`40`	`37`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`void mp_hal_set_interrupt_char(int c) {`
`42`		`- if (c != -1) {`
`43`		`- mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));`
`44`		`- }`
`45`	`42`	`tud_cdc_set_wanted_char(c);`
`46`	`43`	`}`
`47`	`44`