nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 05:08:41 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reapply "SYSLOG_DEFAULT: wrap up_putc/up_nputs calls with critical section"

Browse source 
This reverts commit 35240d77fa.
This commit is contained in:
YAMAMOTO Takashi 2024-11-13 18:33:58 +09:00 committed by Xiang Xiao
parent 0c2ee8b492
commit b990b25b8e
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/serial/serial.c
View file

@ -268,6 +268,10 @@ static int uart_putxmitchar(FAR uart_dev_t *dev, int ch, bool oktoblock)
{
/* The following steps must be atomic with respect to serial
* interrupt handling.
*
* This critical section is also used for the serialization
* with the up_putc-based syslog channels.
* See https://github.com/apache/nuttx/issues/14662
*/
flags = enter_critical_section();

23
drivers/syslog/syslog_channel.c
View file

@ -33,7 +33,6 @@
#include <nuttx/syslog/syslog.h>
#include <nuttx/compiler.h>
#include <nuttx/mutex.h>
#ifdef CONFIG_RAMLOG_SYSLOG
# include <nuttx/syslog/ramlog.h>
@ -72,10 +71,6 @@ static ssize_t syslog_default_write(FAR syslog_channel_t *channel,
* Private Data
****************************************************************************/
#if defined(CONFIG_SYSLOG_DEFAULT) && defined(CONFIG_ARCH_LOWPUTC)
static mutex_t g_lowputs_lock = NXMUTEX_INITIALIZER;
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
static const struct syslog_channel_ops_s g_ramlog_channel_ops =
{
@ -234,11 +229,17 @@ g_syslog_channel[CONFIG_SYSLOG_MAX_CHANNELS] =
#ifdef CONFIG_SYSLOG_DEFAULT
static int syslog_default_putc(FAR syslog_channel_t *channel, int ch)
{
UNUSED(channel);
# ifdef CONFIG_ARCH_LOWPUTC
/* See https://github.com/apache/nuttx/issues/14662
* about what this critical section is for.
*/
irqstate_t flags = enter_critical_section();
up_putc(ch);
leave_critical_section(flags);
# endif
UNUSED(channel);
return ch;
}
@ -246,11 +247,13 @@ static ssize_t syslog_default_write(FAR syslog_channel_t *channel,
FAR const char *buffer, size_t buflen)
{
# ifdef CONFIG_ARCH_LOWPUTC
nxmutex_lock(&g_lowputs_lock);
/* See https://github.com/apache/nuttx/issues/14662
* about what this critical section is for.
*/
irqstate_t flags = enter_critical_section();
up_nputs(buffer, buflen);
nxmutex_unlock(&g_lowputs_lock);
leave_critical_section(flags);
# endif
UNUSED(channel);