diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk index 4f40cd2760..d6287c3f8e 100644 --- a/makefiles/pseudomodules.inc.mk +++ b/makefiles/pseudomodules.inc.mk @@ -86,6 +86,7 @@ PSEUDOMODULES += newlib_gnu_source PSEUDOMODULES += newlib_nano PSEUDOMODULES += openthread PSEUDOMODULES += picolibc +PSEUDOMODULES += picolibc_stdout_buffered PSEUDOMODULES += pktqueue PSEUDOMODULES += posix_headers PSEUDOMODULES += printf_float diff --git a/makefiles/stdio.inc.mk b/makefiles/stdio.inc.mk index 4c7749d2f9..5c1d3bff22 100644 --- a/makefiles/stdio.inc.mk +++ b/makefiles/stdio.inc.mk @@ -55,3 +55,10 @@ ifneq (,$(filter stdio_semihosting,$(USEMODULE))) USEMODULE += xtimer FEATURES_REQUIRED += cpu_core_cortexm endif + +# enable stdout buffering for modules that benefit from sending out buffers in larger chunks +ifneq (,$(filter picolibc,$(USEMODULE))) + ifneq (,$(filter stdio_cdc_acm stdio_ethos slipdev_stdio stdio_semihosting,$(USEMODULE))) + USEMODULE += picolibc_stdout_buffered + endif +endif diff --git a/sys/picolibc_syscalls_default/syscalls.c b/sys/picolibc_syscalls_default/syscalls.c index 3f3d971bdd..060ef33c69 100644 --- a/sys/picolibc_syscalls_default/syscalls.c +++ b/sys/picolibc_syscalls_default/syscalls.c @@ -165,10 +165,12 @@ int kill(pid_t pid, int sig) #include "mutex.h" -static mutex_t picolibc_put_mutex = MUTEX_INIT; - +#ifndef PICOLIBC_STDOUT_BUFSIZE #define PICOLIBC_STDOUT_BUFSIZE 64 +#endif +#ifdef MODULE_PICOLIBC_STDOUT_BUFFERED +static mutex_t picolibc_put_mutex = MUTEX_INIT; static char picolibc_stdout[PICOLIBC_STDOUT_BUFSIZE]; static int picolibc_stdout_queued; @@ -183,10 +185,14 @@ static void _picolibc_flush(void) static int picolibc_put(char c, FILE *file) { (void)file; + mutex_lock(&picolibc_put_mutex); picolibc_stdout[picolibc_stdout_queued++] = c; - if (picolibc_stdout_queued == PICOLIBC_STDOUT_BUFSIZE || c == '\n') + + if (picolibc_stdout_queued == PICOLIBC_STDOUT_BUFSIZE || c == '\n') { _picolibc_flush(); + } + mutex_unlock(&picolibc_put_mutex); return 1; } @@ -200,6 +206,22 @@ static int picolibc_flush(FILE *file) return 0; } +#else +int picolibc_put(char c, FILE *file) +{ + (void)file; + stdio_write(&c, 1); + return 1; +} + +static int picolibc_flush(FILE *file) +{ + (void)file; + return 0; +} + +#endif + static int picolibc_get(FILE *file) { (void)file;