Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 05:16:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

syslog/inbuffer: rename g_si_buffer to g_syslog_intbuffer

Browse Source 
Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an
2024-12-17 15:18:45 +08:00
committed by Xiang Xiao
parent 0331703fc7
commit a307dc0608
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/syslog/syslog_intbuffer.c
+17 -15
View File
@@ -65,9 +65,10 @@ struct syslog_intbuffer_s
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
static struct syslog_intbuffer_s g_si_buffer = static struct syslog_intbuffer_s g_syslog_intbuffer =
{ {
CIRCBUF_INITIALIZER(g_si_buffer.buffer, sizeof(g_si_buffer.buffer)), CIRCBUF_INITIALIZER(g_syslog_intbuffer.buffer,
sizeof(g_syslog_intbuffer.buffer)),
SP_UNLOCKED, SP_UNLOCKED,
}; };
@@ -103,22 +104,22 @@ void syslog_flush_internal(bool force, size_t buflen)
* concurrent modification by other tasks. * concurrent modification by other tasks.
*/ */
flags = spin_lock_irqsave_wo_note(&g_si_buffer.splock); flags = spin_lock_irqsave_wo_note(&g_syslog_intbuffer.splock);
do do
{ {
buffer = circbuf_get_readptr(&g_si_buffer.circ, &size); buffer = circbuf_get_readptr(&g_syslog_intbuffer.circ, &size);
if (size > 0) if (size > 0)
{ {
size = (size >= buflen) ? buflen : size; size = (size >= buflen) ? buflen : size;
syslog_write_foreach(buffer, size, force); syslog_write_foreach(buffer, size, force);
circbuf_readcommit(&g_si_buffer.circ, size); circbuf_readcommit(&g_syslog_intbuffer.circ, size);
buflen -= size; buflen -= size;
} }
} }
while (size > 0 && buflen > 0); while (size > 0 && buflen > 0);
spin_unlock_irqrestore_wo_note(&g_si_buffer.splock, flags); spin_unlock_irqrestore_wo_note(&g_syslog_intbuffer.splock, flags);
} }
/**************************************************************************** /****************************************************************************
@@ -154,28 +155,29 @@ void syslog_add_intbuffer(FAR const char *buffer, size_t buflen)
/* Disable concurrent modification from interrupt handling logic */ /* Disable concurrent modification from interrupt handling logic */
flags = spin_lock_irqsave_wo_note(&g_si_buffer.splock); flags = spin_lock_irqsave_wo_note(&g_syslog_intbuffer.splock);
space = circbuf_space(&g_si_buffer.circ); space = circbuf_space(&g_syslog_intbuffer.circ);
if (space >= buflen) if (space >= buflen)
{ {
circbuf_write(&g_si_buffer.circ, buffer, buflen); circbuf_write(&g_syslog_intbuffer.circ, buffer, buflen);
} }
else if (buflen <= sizeof(g_si_buffer.buffer)) else if (buflen <= sizeof(g_syslog_intbuffer.buffer))
{ {
syslog_flush_internal(true, buflen - space); syslog_flush_internal(true, buflen - space);
circbuf_write(&g_si_buffer.circ, buffer, buflen); circbuf_write(&g_syslog_intbuffer.circ, buffer, buflen);
} }
else else
{ {
syslog_flush_intbuffer(true); syslog_flush_intbuffer(true);
space = buflen - sizeof(g_si_buffer.buffer); space = buflen - sizeof(g_syslog_intbuffer.buffer);
syslog_write_foreach(buffer, space, true); syslog_write_foreach(buffer, space, true);
circbuf_write(&g_si_buffer.circ, buffer + space, buflen - space); circbuf_write(&g_syslog_intbuffer.circ,
buffer + space, buflen - space);
} }
spin_unlock_irqrestore_wo_note(&g_si_buffer.splock, flags); spin_unlock_irqrestore_wo_note(&g_syslog_intbuffer.splock, flags);
} }
/**************************************************************************** /****************************************************************************
@@ -199,7 +201,7 @@ void syslog_add_intbuffer(FAR const char *buffer, size_t buflen)
void syslog_flush_intbuffer(bool force) void syslog_flush_intbuffer(bool force)
{ {
syslog_flush_internal(force, sizeof(g_si_buffer.buffer)); syslog_flush_internal(force, sizeof(g_syslog_intbuffer.buffer));
} }
#endif /* CONFIG_SYSLOG_INTBUFFER */ #endif /* CONFIG_SYSLOG_INTBUFFER */