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

SYSLOG_DEFAULT: avoid using critical section in certain cases

Browse source 
Note that SYSLOG_DEFAULT can be used in extreme situations,
including very early in the boot.
This commit is contained in:
YAMAMOTO Takashi 2024-11-14 16:45:41 +09:00 committed by Xiang Xiao
parent b990b25b8e
commit 637a0f5af2
1 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/syslog/syslog_channel.c
View file

@ -33,6 +33,7 @@
#include <nuttx/syslog/syslog.h>
#include <nuttx/compiler.h>
#include <nuttx/init.h>
#ifdef CONFIG_RAMLOG_SYSLOG
# include <nuttx/syslog/ramlog.h>
@ -217,6 +218,30 @@ g_syslog_channel[CONFIG_SYSLOG_MAX_CHANNELS] =
* Private Functions
****************************************************************************/
#if defined(CONFIG_SYSLOG_DEFAULT) && defined(CONFIG_ARCH_LOWPUTC)
/****************************************************************************
* Name: csection_available
*
* Description:
* Return true if the critical section is available.
*
****************************************************************************/
static bool csection_available(void)
{
/* Degrade the critical section in a few cases:
*
* a) early in the boot, where tasks are not available
*
* b) after a panic, where taking a lock can make the situation worse
*/
return OSINIT_TASK_READY() && g_nx_initstate != OSINIT_PANIC;
}
#endif /* defined(CONFIG_SYSLOG_DEFAULT) && defined(CONFIG_ARCH_LOWPUTC) */
/****************************************************************************
* Name: syslog_default_putc
*
@ -230,13 +255,20 @@ g_syslog_channel[CONFIG_SYSLOG_MAX_CHANNELS] =
static int syslog_default_putc(FAR syslog_channel_t *channel, int ch)
{
# ifdef CONFIG_ARCH_LOWPUTC
/* See https://github.com/apache/nuttx/issues/14662
* about what this critical section is for.
*/
if (csection_available())
{
/* 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);
irqstate_t flags = enter_critical_section();
up_putc(ch);
leave_critical_section(flags);
}
else
{
up_putc(ch);
}
# endif
UNUSED(channel);
@ -247,13 +279,20 @@ static ssize_t syslog_default_write(FAR syslog_channel_t *channel,
FAR const char *buffer, size_t buflen)
{
# ifdef CONFIG_ARCH_LOWPUTC
/* See https://github.com/apache/nuttx/issues/14662
* about what this critical section is for.
*/
if (csection_available())
{
/* 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);
leave_critical_section(flags);
irqstate_t flags = enter_critical_section();
up_nputs(buffer, buflen);
leave_critical_section(flags);
}
else
{
up_nputs(buffer, buflen);
}
# endif
UNUSED(channel);