cpu/native: use async read for stdio_read()

cpu/native/async_read.c

@@ -52,7 +52,10 @@ void native_async_read_cleanup(void) {
     unregister_interrupt(SIGIO);
 
     for (int i = 0; i < _next_index; i++) {
-        real_close(_fds[i].fd);
+        /* don't close stdin */
+        if (_fds[i].fd != STDIN_FILENO) {
+            real_close(_fds[i].fd);
+        }
         if (pollers[i].child_pid) {
             kill(pollers[i].child_pid, SIGKILL);
         }

cpu/native/include/async_read.h

@@ -29,7 +29,7 @@ extern "C" {
  * @brief   Maximum number of file descriptors
  */
 #ifndef ASYNC_READ_NUMOF
-#define ASYNC_READ_NUMOF 2
+#define ASYNC_READ_NUMOF 8
 #endif
 
 /**

cpu/native/startup.c

@@ -446,7 +446,7 @@
 typedef void (*init_func_t)(int argc, char **argv, char **envp);
 #ifdef __APPLE__
 /* Taken from the sources of Apple's dyld launcher
  * https://github.com/opensource-apple/dyld/blob/3f928f32597888c5eac6003b9199d972d49857b5/src/dyldInitialization.cpp#L85-L104
  */
 /* Find the extents of the __DATA __mod_init_func section */
 extern init_func_t __init_array_start __asm("section$start$__DATA$__mod_init_func");
@@ -465,8 +465,6 @@
 __attribute__((constructor)) static void startup(int argc, char **argv, char **envp)
 {
     _native_init_syscalls();
-    /* initialize stdio as early as possible */
-    early_init();
 
     _native_argv = argv;
     _progname = argv[0];
@@ -682,6 +680,9 @@
 
     register_interrupt(SIGUSR1, _reset_handler);
 
+    /* initialize stdio after signal setup */
+    early_init();
+
     puts("RIOT native hardware initialization complete.\n");
     irq_enable();
     kernel_init();

cpu/native/stdio_native/stdio_native.c

@@ -11,25 +11,40 @@
  *
  * @file
  * @author  Martine S. Lenders <[email protected]>
+ * @author  Benjamin Valentin <[email protected]>
  */
 
+#include "async_read.h"
 #include "kernel_defines.h"
 #include "native_internal.h"
 
 #include "stdio_base.h"
 
-void stdio_init(void)
-{
+static void _async_read_wrapper(int fd, void *arg) {
+    uint8_t buf[1];
+
+    int res = real_read(fd, &buf, sizeof(buf));
+    if (res > 0) {
+        isrpipe_write(arg, buf, res);
+    }
+
+    native_async_read_continue(fd);
 }
 
-ssize_t stdio_read(void* buffer, size_t max_len)
+static void _init(void)
 {
-    return real_read(STDIN_FILENO, buffer, max_len);
+    native_async_read_setup();
+    if (IS_USED(MODULE_STDIN)) {
+        native_async_read_add_int_handler(STDIN_FILENO, &stdin_isrpipe,
+                                          _async_read_wrapper);
+    }
 }
 
-ssize_t stdio_write(const void* buffer, size_t len)
+static ssize_t _write(const void* buffer, size_t len)
 {
     return real_write(STDOUT_FILENO, buffer, len);
 }
 
+STDIO_PROVIDER(STDIO_NATIVE, _init, NULL, _write)
+
 /** @} */

cpu/native/syscalls.c

@@ -229,7 +229,7 @@ ssize_t _native_read(int fd, void *buf, size_t count)
 {
     ssize_t r;
 
-    if (fd == STDIN_FILENO) {
+    if (fd == STDIN_FILENO && IS_USED(MODULE_STDIN)) {
         return stdio_read(buf, count);
     }
 

examples/gnrc_border_router/Makefile.native.conf

@@ -4,7 +4,6 @@ ZEP_PORT_BASE ?= 17754
 ZEP_PORT_MAX := $(shell expr $(ZEP_PORT_BASE) + $(ZEP_DEVICES) - 1)
 
 CFLAGS += -DSOCKET_ZEP_MAX=$(ZEP_DEVICES)
-CFLAGS += -DASYNC_READ_NUMOF=$(shell expr $(ZEP_DEVICES) + 1)
 CFLAGS += -DCONFIG_DHCPV6_CLIENT_PFX_LEASE_MAX=$(ZEP_DEVICES)
 
 # Set CFLAGS if not being set via Kconfig

examples/telnet_server/Makefile

@@ -35,6 +35,13 @@ USEMODULE += ps
 # Include the telnet server
 USEMODULE += stdio_telnet
 
+# select a 2nd stdio method
+ifeq (,$(filter native%,$(BOARD)))
+  USEMODULE += stdio_uart
+else
+  USEMODULE += stdio_native
+endif
+
 # Enable faster re-connects
 CFLAGS += -DCONFIG_GNRC_TCP_EXPERIMENTAL_DYN_MSL_EN=1
 

examples/telnet_server/main.c

@@ -79,7 +79,6 @@ int main(void)
 
     /* start shell */
     printf("All up, awaiting connection on port %u\n", CONFIG_TELNET_PORT);
-    puts("Local shell disabled");
     char line_buf[SHELL_DEFAULT_BUFSIZE];
     shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE);
 

makefiles/stdio.inc.mk

@@ -17,7 +17,6 @@ STDIO_MODULES = \
 STDIO_LEGACY_MODULES = \
   ethos_stdio \
   stdio_ethos \
-  stdio_native  # requires #19002 \
   #
 
 # select stdio_uart if no other stdio module is slected

pkg/ubasic/patches/0002-avoid-use-of-floating-point-math.patch

@@ -0,0 +1,37 @@
+From 5a492cf6ba56d2d16cfeaa18b6d1f0cb21429640 Mon Sep 17 00:00:00 2001
+From: Benjamin Valentin <[email protected]>
+Date: Mon, 12 Jun 2023 16:23:01 +0200
+Subject: [PATCH] avoid use of floating point math
+
+---
+ tests.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests.c b/tests.c
+index a7bab89..77be22f 100644
+--- a/tests.c
++++ b/tests.c
+@@ -93,7 +93,7 @@ void run(const char program[]) {
+   fflush(stdout);
+
+   clock_t start_t, end_t;
+-  double delta_t;
++  unsigned delta_t;
+
+   start_t = clock();
+
+@@ -104,9 +104,9 @@ void run(const char program[]) {
+   } while(!ubasic_finished());
+
+   end_t = clock();
+-  delta_t = (double)(end_t - start_t) / CLOCKS_PER_SEC;
++  delta_t = (1000UL * (end_t - start_t)) / CLOCKS_PER_SEC;
+
+-  printf("done. Run time: %.3f s\n", delta_t);
++  printf("done. Run time: %u ms\n", delta_t);
+ }
+
+ /*---------------------------------------------------------------------------*/
+-- 
+2.39.2
+

sys/Kconfig.stdio

@@ -40,7 +40,6 @@ config MODULE_SLIPDEV_STDIO
     bool "SLIP network device"
     depends on MODULE_SLIPDEV
     select USE_STDOUT_BUFFERED
-    select MODULE_ISRPIPE
 
 config MODULE_STDIO_NULL
     bool "Null"
@@ -59,6 +58,7 @@ config MODULE_STDIO_UART_ONLCR
 config MODULE_STDIO_NATIVE
     bool "Native"
     depends on CPU_ARCH_NATIVE
+    select MODULE_ISRPIPE
 
 config MODULE_STDIO_ETHOS
     bool "ETHOS"

sys/include/net/telnet.h

@@ -72,7 +72,7 @@ int telnet_server_start(void);
  *
  * @return  0 on success, error otherwise
  */
-int telnet_server_write(const void* buffer, size_t len);
+ssize_t telnet_server_write(const void* buffer, size_t len);
 
 /**
  * @brief   Read data from the telnet client, will block until data is available.

sys/net/application_layer/telnet/telnet_server.c

@@ -293,7 +293,7 @@ static void *telnet_thread(void *arg)
     return NULL;
 }
 
-int telnet_server_write(const void* buffer, size_t len)
+ssize_t telnet_server_write(const void* buffer, size_t len)
 {
     if (connected) {
         int res = _write_buffer(buffer, len);

tests/pkg/libfixmath_unittests/Makefile

@@ -3,6 +3,7 @@ include ../Makefile.pkg_common
 USEMODULE += libfixmath-unittests
 
 ifneq (,$(filter native native64,$(BOARD)))
+  DISABLE_MODULE += test_utils_interactive_sync
   LINKFLAGS += -lm
 endif
 

tests/pkg/ubasic/tests/01-run.py

@@ -17,7 +17,7 @@
 
 def testfunc(child):
     for i in range(1, 6):
-        child.expect(r"Running test #%d... done. Run time: \d+.\d{3} s" % i,
+        child.expect(r"Running test #%d... done. Run time: \d+ ms" % i,
                      timeout=TIMEOUT)
 
 

tests/pkg/wolfssl/Makefile

@@ -21,6 +21,8 @@ USEMODULE += xtimer
 
 ifeq (,$(filter native native64,$(BOARD)))
   CFLAGS += -DBENCH_EMBEDDED
+else
+  DISABLE_MODULE += test_utils_interactive_sync
 endif
 
 TEST_ON_CI_WHITELIST += native native64

tests/pkg/wolfssl/main.c

@@ -33,10 +33,6 @@
 int main(void)
 {
     LOG_INFO("wolfSSL Crypto Test!\n");
-    /* Wait to work around a failing tests
-     * on platforms that don't have RTC synchronized
-     */
-    xtimer_sleep(1);
     wolfcrypt_test(NULL);
 #ifdef MODULE_WOLFCRYPT_BENCHMARK
     LOG_INFO("wolfSSL Benchmark!\n");

tests/sys/shell/tests/01-run.py

@@ -182,16 +182,6 @@ def check_line_canceling(child):
     assert garbage_expected == garbage_received
 
 
-def check_erase_long_line(child, longline):
-    # FIXME: this only works on native, due to #10634 combined with socat
-    # insisting in line-buffering the terminal.
-
-    if BOARD in ['native', 'native64']:
-        longline_erased = longline + "\b"*len(longline) + "echo"
-        child.sendline(longline_erased)
-        child.expect_exact('"echo"')
-
-
 def check_control_d(child):
     # The current shell instance was initiated by shell_run_once(). The shell will exit.
     child.sendline(CONTROL_D)
@@ -220,8 +210,6 @@ def testfunc(child):
     else:
         print("skipping check_line_canceling()")
 
-    check_erase_long_line(child, longline)
-
     check_control_d(child)
 
     # loop other defined commands and expected output