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

Squashed commit of the following:

Browse Source 
drivers/syslog:  Channel configuration.  Decouple SYSLOG_SERIAL_CONSOLE and ARCH_LOWPUTC.  Since some hardware can output log to the special debug channel not serial.

    drivers/syslog/vsyslog.c: Support pre-pending a prefix string to log output if enabled.  This very useful to identify which cpu send out the log in AMP SoC.

    drivers/syslog/vsyslog.c: Make timestamp output same as linux kernel.  It's very useful if NuttX syslog retarget to Linux syslog.
This commit is contained in:
Xiang Xiao 2018-08-26 06:49:35 -06:00 committed by Gregory Nutt
parent bd252230ad
commit 1ee6083de3
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/syslog/Kconfig
View File

@ -125,6 +125,19 @@ config SYSLOG_TIMESTAMP_REALTIME
CLOCK_MONOTONIC, if enabled, will be used or the system timer CLOCK_MONOTONIC, if enabled, will be used or the system timer
is not. is not.
config SYSLOG_PREFIX
bool "Prepend prefix to syslog message"
default n
---help---
Prepend prefix to syslog message.
config SYSLOG_PREFIX_STRING
string "Prefix string"
depends on SYSLOG_PREFIX
default ""
---help---
The prefix string to be prepend.
config SYSLOG_SERIAL_CONSOLE config SYSLOG_SERIAL_CONSOLE
bool bool
default n default n

2
drivers/syslog/syslog_channel.c
View File

@ -57,7 +57,7 @@
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_SYSLOG_SERIAL_CONSOLE) && defined(CONFIG_ARCH_LOWPUTC) #if defined(CONFIG_ARCH_LOWPUTC)
# define HAVE_LOWPUTC # define HAVE_LOWPUTC
#elif !defined(CONFIG_RAMLOG_SYSLOG) #elif !defined(CONFIG_RAMLOG_SYSLOG)
# define NEED_LOWPUTC # define NEED_LOWPUTC

2
drivers/syslog/syslog_consolechannel.c
View File

@ -54,7 +54,7 @@
****************************************************************************/ ****************************************************************************/
#undef HAVE_LOWPUTC #undef HAVE_LOWPUTC
#if defined(CONFIG_SYSLOG_SERIAL_CONSOLE) && defined(CONFIG_ARCH_LOWPUTC) #if defined(CONFIG_ARCH_LOWPUTC)
# define HAVE_LOWPUTC 1 # define HAVE_LOWPUTC 1
#endif #endif

12
drivers/syslog/vsyslog.c
View File

@ -131,13 +131,21 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap)
#if defined(CONFIG_SYSLOG_TIMESTAMP) #if defined(CONFIG_SYSLOG_TIMESTAMP)
/* Pre-pend the message with the current time, if available */ /* Pre-pend the message with the current time, if available */
(void)lib_sprintf(&stream.public, "[%6d.%06d]", (void)lib_sprintf(&stream.public, "[%5d.%06d] ",
ts.tv_sec, ts.tv_nsec/1000); ts.tv_sec, ts.tv_nsec/1000);
#endif #endif
#if defined(CONFIG_SYSLOG_PREFIX)
/* Pre-pend the prefix, if available */
ret = lib_sprintf(&stream.public, "%s", CONFIG_SYSLOG_PREFIX_STRING);
#else
ret = 0;
#endif
/* Generate the output */ /* Generate the output */
ret = lib_vsprintf(&stream.public, fmt, *ap); ret += lib_vsprintf(&stream.public, fmt, *ap);
#ifdef CONFIG_SYSLOG_BUFFER #ifdef CONFIG_SYSLOG_BUFFER
/* Flush and destroy the syslog stream buffer */ /* Flush and destroy the syslog stream buffer */