From f8a9e11ff4f42620bbe6e678f009bdadcb4ac542 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 23 Aug 2020 08:46:42 -0500
Subject: WIP supervisor: check for interrupt during rx_chr

---
 supervisor/shared/micropython.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'supervisor')

diff --git a/supervisor/shared/micropython.c b/supervisor/shared/micropython.c
index 245db11d4..cd9485f8c 100644
--- a/supervisor/shared/micropython.c
+++ b/supervisor/shared/micropython.c
@@ -29,14 +29,32 @@
 #include "supervisor/serial.h"
 #include "lib/oofatfs/ff.h"
 #include "py/mpconfig.h"
+#include "py/mpstate.h"
 
 #include "supervisor/shared/status_leds.h"
 
+#if CIRCUITPY_WATCHDOG
+#include "shared-bindings/watchdog/__init__.h"
+#define WATCHDOG_EXCEPTION_CHECK() (MP_STATE_VM(mp_pending_exception) == &mp_watchdog_timeout_exception)
+#else
+#define WATCHDOG_EXCEPTION_CHECK() 0
+#endif
+
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         #ifdef MICROPY_VM_HOOK_LOOP
             MICROPY_VM_HOOK_LOOP
         #endif
+        // Check to see if we've been CTRL-Ced by autoreload or the user.
+        if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
+            // clear exception and generate stacktrace
+            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+            nlr_raise(&MP_STATE_VM(mp_kbd_exception));
+          }
+        if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) || WATCHDOG_EXCEPTION_CHECK()) {
+            // stop reading immediately
+            return EOF;
+        }
         if (serial_bytes_available()) {
             toggle_rx_led();
             return serial_read();
-- 
cgit v1.2.3


From 1033e89561d6535f32aa4cfd3541ffd9683a1123 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 23 Aug 2020 09:03:34 -0500
Subject: supervisor: use mp_handle_pending to check for exceptions

---
 supervisor/shared/micropython.c | 12 ++----------
 supervisor/shared/tick.c        | 13 ++-----------
 2 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'supervisor')

diff --git a/supervisor/shared/micropython.c b/supervisor/shared/micropython.c
index cd9485f8c..bbc4807f9 100644
--- a/supervisor/shared/micropython.c
+++ b/supervisor/shared/micropython.c
@@ -30,6 +30,7 @@
 #include "lib/oofatfs/ff.h"
 #include "py/mpconfig.h"
 #include "py/mpstate.h"
+#include "py/runtime.h"
 
 #include "supervisor/shared/status_leds.h"
 
@@ -45,16 +46,7 @@ int mp_hal_stdin_rx_chr(void) {
         #ifdef MICROPY_VM_HOOK_LOOP
             MICROPY_VM_HOOK_LOOP
         #endif
-        // Check to see if we've been CTRL-Ced by autoreload or the user.
-        if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
-            // clear exception and generate stacktrace
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(&MP_STATE_VM(mp_kbd_exception));
-          }
-        if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) || WATCHDOG_EXCEPTION_CHECK()) {
-            // stop reading immediately
-            return EOF;
-        }
+        mp_handle_pending();
         if (serial_bytes_available()) {
             toggle_rx_led();
             return serial_read();
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
index 4af59f78e..f26e1e79d 100644
--- a/supervisor/shared/tick.c
+++ b/supervisor/shared/tick.c
@@ -27,6 +27,7 @@
 #include "supervisor/shared/tick.h"
 
 #include "py/mpstate.h"
+#include "py/runtime.h"
 #include "supervisor/linker.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/background_callback.h"
@@ -149,17 +150,7 @@ void mp_hal_delay_ms(mp_uint_t delay) {
     while (remaining > 0) {
         RUN_BACKGROUND_TASKS;
         // Check to see if we've been CTRL-Ced by autoreload or the user.
-        if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)))
-           {
-            // clear exception and generate stacktrace
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(&MP_STATE_VM(mp_kbd_exception));
-          }
-        if( MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception)) ||
-           WATCHDOG_EXCEPTION_CHECK()) {
-            // stop sleeping immediately
-            break;
-        }
+        mp_handle_pending();
         remaining = end_tick - port_get_raw_ticks(NULL);
         // We break a bit early so we don't risk setting the alarm before the time when we call
         // sleep.
-- 
cgit v1.2.3