pbio/platform/sim_hub: Don't use Linux signal for clock tick.

This interrupts syscalls like reading data from a pipe, especially when debugging. We can instead just request polling when MicroPython drives the poll hook and the wall clock time has changed.

For the CI clock variant, this was not implented at all yet. While we are at it, ensure it increments the clock every N instructions, so that even tight loops without any waits will advance. For example, this would be needed to run asynchronous scripts that don't _WFI anywhere.

Author: laurensvalk

.vscode/tasks.json

@@ -47,7 +47,7 @@
             },
             "label": "build simhub (debug)",
             "type": "shell",
-            "command": "make -C ../../micropython/mpy-cross -j && poetry run make DEBUG=1 BUILD=build-debug COPT=-DPBDRV_CONFIG_CLOCK_LINUX -j",
+            "command": "make -C ../../micropython/mpy-cross -j && poetry run make DEBUG=1 BUILD=build-debug COPT=-DPBDRV_CONFIG_CLOCK_LOCAL -j",
         },
         {
             "label": "build test-pbio",

bricks/_common/mpconfigport.h

@@ -149,11 +149,13 @@ typedef long mp_off_t;
 #define MICROPY_END_ATOMIC_SECTION(state) (void)(state)
 #endif
 
+#ifndef MICROPY_VM_HOOK_LOOP
 #define MICROPY_VM_HOOK_LOOP \
     do { \
         extern bool pbio_os_run_processes_once(void); \
         pbio_os_run_processes_once(); \
     } while (0);
+#endif
 
 #define MICROPY_GC_HOOK_LOOP(i) do { \
         if (((i) & 0xf) == 0) { \

bricks/simhub/mpconfigport.h

@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include <pbdrv/config.h>
 
 #define MICROPY_HW_BOARD_NAME                   "Desktop"
 #define MICROPY_HW_MCU_NAME                     "Desktop"
@@ -53,4 +54,32 @@
 #define PYBRICKS_OPT_CUSTOM_IMPORT              (0)
 #define PYBRICKS_OPT_NATIVE_MOD                 (0)
 
+#if PBDRV_CONFIG_CLOCK_TEST
+#define MICROPY_VM_HOOK_LOOP \
+    do { \
+        static uint32_t count; \
+        if ((count % 16) == 0) { \
+            extern void pbio_test_clock_tick(uint32_t ticks); \
+            pbio_test_clock_tick(1); \
+        } \
+        extern bool pbio_os_run_processes_once(void); \
+        pbio_os_run_processes_once(); \
+    } while (0);
+#else
+#define MICROPY_VM_HOOK_LOOP \
+    do { \
+        static uint32_t clock_last; \
+        extern uint32_t pbdrv_clock_get_ms(void); \
+        uint32_t clock_now = pbdrv_clock_get_ms(); \
+        if (clock_last != clock_now) { \
+            extern void pbio_os_request_poll(void); \
+            pbio_os_request_poll(); \
+            clock_last = clock_now; \
+        } \
+        extern bool pbio_os_run_processes_once(void); \
+        pbio_os_run_processes_once(); \
+    } while (0);
+#endif
+
+
 #include "../_common/mpconfigport.h"

bricks/simhub/pbio_os_hook.c

@@ -53,4 +53,7 @@ void pbio_os_hook_wait_for_interrupt(pbio_os_irq_flags_t flags) {
     MP_THREAD_GIL_EXIT();
     pselect(0, NULL, NULL, NULL, &timeout, &origmask);
     MP_THREAD_GIL_ENTER();
+
+    // There is a new timer event to handle.
+    pbio_os_request_poll();
 }

lib/pbio/platform/sim_hub/pbdrvconfig.h

@@ -15,8 +15,8 @@
 #define PBDRV_CONFIG_BUTTON_TEST                            (1)
 
 #define PBDRV_CONFIG_CLOCK                                  (1)
-#ifdef PBDRV_CONFIG_CLOCK_LINUX
-#define PBDRV_CONFIG_CLOCK_LINUX_SIGNAL                     (1)
+#ifdef PBDRV_CONFIG_CLOCK_LOCAL
+#define PBDRV_CONFIG_CLOCK_LINUX                            (1)
 #else
 #define PBDRV_CONFIG_CLOCK_TEST                             (1)
 #endif