mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 06:42:32 +08:00
I had to make following change to fix interrupt context syslog (INTBUFFER untested)
This commit is contained in:
committed by
Gregory Nutt
parent
5ef00f0b91
commit
a6e556d31c
@@ -40,6 +40,7 @@
|
|||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <nuttx/sched.h>
|
||||||
#include <nuttx/syslog/syslog.h>
|
#include <nuttx/syslog/syslog.h>
|
||||||
|
|
||||||
#include "syslog.h"
|
#include "syslog.h"
|
||||||
@@ -100,8 +101,21 @@ ssize_t syslog_default_write(FAR const char *buffer, size_t buflen)
|
|||||||
ssize_t syslog_write(FAR const char *buffer, size_t buflen)
|
ssize_t syslog_write(FAR const char *buffer, size_t buflen)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_SYSLOG_WRITE
|
#ifdef CONFIG_SYSLOG_WRITE
|
||||||
return g_syslog_channel->sc_write(buffer, buflen);
|
if (!up_interrupt_context() && !sched_idletask())
|
||||||
#else
|
{
|
||||||
return syslog_default_write(buffer, buflen);
|
#ifdef CONFIG_SYSLOG_INTBUFFER
|
||||||
|
/* Flush any characters that may have been added to the interrupt
|
||||||
|
* buffer.
|
||||||
|
*/
|
||||||
|
|
||||||
|
(void)syslog_flush_intbuffer(g_syslog_channel, false);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
return g_syslog_channel->sc_write(buffer, buflen);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
return syslog_default_write(buffer, buflen);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user