Merge pull request #19002 from benpicco/cpu/native-read_preempt

cpu/native: use async read for stdio_read()

Author: benpicco

cpu/native/async_read.c

@@ -52,7 +52,10 @@ void native_async_read_cleanup(void) {
     native_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

@@ -30,7 +30,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

@@ -465,8 +465,6 @@ static void _reset_handler(void)
 __attribute__((constructor)) static void startup(int argc, char **argv, char **envp)
 {
     _native_init_syscalls();
-    /* initialize stdio as early as possible */
-    early_init();
 
     /* Passing argc, argv, and envp to init_fini handlers is a glibc
      * extension. If we are not running glibc, we parse /proc/self/cmdline
@@ -730,6 +728,9 @@ __attribute__((constructor)) static void startup(int argc, char **argv, char **e
 
     native_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

@@ -9,23 +9,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[STDIO_RX_BUFSIZE];
+
+    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

@@ -166,7 +166,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/networking/gnrc/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

makefiles/stdio.inc.mk

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

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/lua_loader/Makefile

@@ -7,6 +7,9 @@ USEMODULE += stdin
 
 BOARD_WHITELIST += native native64 samr21-xpro
 
+# currently fails with a Floating point exception - see #495
+TEST_ON_CI_BLACKLIST += native
+
 ifeq (,$(filter native native64,$(BOARD)))
   # This stack size is large enough to run Lua print() functions of
   # various lengths. Other functions untested.