sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ramlog: init head and tail when buffer is empty on boot

Browse Source 
N/A

Change-Id: I6963ef6256c3a93ac7a63115c303033ceafa321f
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2021-07-07 18:10:29 +08:00 committed by Xiang Xiao
parent c8ce33c634
commit 4bb48892d0
1 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
drivers/syslog/ramlog.c
View File

@ -208,6 +208,60 @@ static void ramlog_pollnotify(FAR struct ramlog_dev_s *priv,
} }
} }
/****************************************************************************
* Name: ramlog_initbuf
*
* Description:
* Initialize g_sysdev based on the current system ramlog buffer.
*
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
static void ramlog_initbuf(void)
{
FAR struct ramlog_dev_s *priv = &g_sysdev;
bool is_empty = true;
char prev;
char cur;
size_t i;
if (priv->rl_head != CONFIG_RAMLOG_BUFSIZE ||
priv->rl_tail != CONFIG_RAMLOG_BUFSIZE)
{
return;
}
prev = priv->rl_buffer[priv->rl_bufsize - 1];
for (i = 0; i < priv->rl_bufsize; i++)
{
cur = priv->rl_buffer[i];
if (!isascii(cur))
{
memset(priv->rl_buffer, 0, priv->rl_bufsize);
break;
}
else if (prev && !cur)
{
priv->rl_head = i;
is_empty = false;
}
else if (!prev && cur)
{
priv->rl_tail = i;
}
prev = cur;
}
if (i != priv->rl_bufsize || is_empty)
{
priv->rl_head = priv->rl_tail = 0;
}
}
#endif
/**************************************************************************** /****************************************************************************
* Name: ramlog_addchar * Name: ramlog_addchar
****************************************************************************/ ****************************************************************************/
@ -217,6 +271,13 @@ static int ramlog_addchar(FAR struct ramlog_dev_s *priv, char ch)
irqstate_t flags; irqstate_t flags;
size_t nexthead; size_t nexthead;
#ifdef CONFIG_RAMLOG_SYSLOG
if (priv == &g_sysdev)
{
ramlog_initbuf();
}
#endif
/* Disable interrupts (in case we are NOT called from interrupt handler) */ /* Disable interrupts (in case we are NOT called from interrupt handler) */
flags = enter_critical_section(); flags = enter_critical_section();
@ -696,61 +757,6 @@ errout:
return ret; return ret;
} }
/****************************************************************************
* Name: ramlog_initbuf
*
* Description:
* Initialize g_sysdev based on the current system ramlog buffer.
*
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
static void ramlog_initbuf(void)
{
FAR struct ramlog_dev_s *priv = &g_sysdev;
char prev, cur;
size_t i;
if (priv->rl_head != CONFIG_RAMLOG_BUFSIZE ||
priv->rl_tail != CONFIG_RAMLOG_BUFSIZE)
{
return;
}
prev = priv->rl_buffer[priv->rl_bufsize - 1];
for (i = 0; i < priv->rl_bufsize; i++)
{
cur = priv->rl_buffer[i];
if (!isascii(cur))
{
goto out;
}
if (prev && !cur)
{
priv->rl_head = i;
}
if (!prev && cur)
{
priv->rl_tail = i;
}
prev = cur;
}
out:
if (i != priv->rl_bufsize)
{
priv->rl_head = 0;
priv->rl_tail = 0;
memset(priv->rl_buffer, 0, priv->rl_bufsize);
}
}
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -840,8 +846,6 @@ int ramlog_putc(FAR struct syslog_channel_s *channel, int ch)
UNUSED(channel); UNUSED(channel);
ramlog_initbuf();
/* Add the character to the RAMLOG */ /* Add the character to the RAMLOG */
ret = ramlog_addchar(priv, ch); ret = ramlog_addchar(priv, ch);