Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into syslog

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-19 09:47:13 -06:00
parent 12150bc6c1 99ad3e9bcf
commit f59196247c
18 changed files with 204 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/armv7-m/Kconfig
+1
View File
@@ -160,6 +160,7 @@ config ARMV7M_STACKCHECK
config ARMV7M_ITMSYSLOG
bool "ITM SYSLOG support"
default n
select ARCH_HAVE_SYSLOG
select SYSLOG
---help---
Enable hooks to support ITM syslog output. This requires additional
arch/arm/src/common/up_initialize.c
+1 -6
View File
@@ -49,7 +49,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/crypto/crypto.h>
@@ -248,12 +248,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/avr/src/common/up_initialize.c
+1 -6
View File
@@ -48,7 +48,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <arch/board/board.h>
@@ -267,12 +267,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/hc/src/common/up_initialize.c
+1 -6
View File
@@ -49,7 +49,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include "up_arch.h"
@@ -186,12 +186,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/mips/src/common/up_initialize.c
+1 -6
View File
@@ -49,7 +49,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <arch/board/board.h>
@@ -188,12 +188,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/sh/src/common/up_initialize.c
+1 -6
View File
@@ -49,7 +49,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include "up_arch.h"
@@ -180,12 +180,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/sim/src/up_initialize.c
+3 -6
View File
@@ -50,7 +50,7 @@
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include "up_internal.h"
@@ -168,12 +168,9 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
#ifdef CONFIG_SYSLOG_CHAR
/* Initialize the system logging device */
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit(); /* System logging device */
#endif
#if defined(CONFIG_FS_FAT) && !defined(CONFIG_DISABLE_MOUNTPOINT)
up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */
arch/x86/src/common/up_initialize.c
+1 -6
View File
@@ -49,7 +49,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <arch/board/board.h>
@@ -188,12 +188,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/z16/src/common/up_initialize.c
+1 -6
View File
@@ -49,7 +49,7 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <arch/board/board.h>
@@ -188,12 +188,7 @@ void up_initialize(void)
/* Initialize the system logging device */
#ifdef CONFIG_SYSLOG_CHAR
syslog_initialize();
#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
arch/z80/src/common/up_initialize.c
+6 -1
View File
@@ -48,7 +48,8 @@
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <arch/board/board.h>
@@ -182,6 +183,10 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
/* Initialize the system logging device */
syslog_initialize();
#ifndef CONFIG_NETDEV_LATEINIT
/* Initialize the network */
drivers/syslog/Kconfig
+27 -22
View File
@@ -5,19 +5,11 @@
comment "System Logging"
config SYSLOG_INTBUFFER
bool "Use interrupt buffer"
default n
---help---
Enables an interrupt buffer that will be used to serialize debug
output from interrupt handlers.
# Selected if the architecture has its own, built-in SYSLOGgin enabled
config SYSLOG_INTBUFSIZE
int "Interrupt buffer size"
default 512
depends on SYSLOG_INTBUFFER
---help---
The size of the interrupt buffer in bytes.
config ARCH_HAVE_SYSLOG
bool
default n
config RAMLOG
bool "RAM log device support"
@@ -37,7 +29,7 @@ if RAMLOG
config RAMLOG_SYSLOG
bool "Use RAMLOG for SYSLOG"
default n
depends on SYSLOG
depends on SYSLOG && !ARCH_HAVE_SYSLOG
---help---
Use the RAM logging device for the syslogging interface. If this feature
is enabled (along with SYSLOG), then all debug output (only) will be re-directed
@@ -86,7 +78,27 @@ config RAMLOG_NPOLLWAITERS
endif
comment "System Logging"
config DRIVER_NOTE
bool "Scheduler instrumentation driver"
default n
depends on SCHED_INSTRUMENTATION_BUFFER
---help---
Enable building a serial driver that can be used by an application to read data
from the in-memory, scheduler instrumentatin "note" buffer.
config SYSLOG_INTBUFFER
bool "Use interrupt buffer"
default n
---help---
Enables an interrupt buffer that will be used to serialize debug
output from interrupt handlers.
config SYSLOG_INTBUFSIZE
int "Interrupt buffer size"
default 512
depends on SYSLOG_INTBUFFER
---help---
The size of the interrupt buffer in bytes.
config SYSLOG
bool "Advanced SYSLOG features"
@@ -109,6 +121,7 @@ if SYSLOG
config SYSLOG_CHAR
bool "System log character device support"
default y
depends on !ARCH_HAVE_SYSLOG
---help---
Enable the generic character device for the SYSLOG. The full path to the
SYSLOG device is provided by SYSLOG_DEVPATH. A valid character device (or
@@ -138,11 +151,3 @@ config SYSLOG_CONSOLE
output (syslog_putc). This is useful, for example, if the only console is a Telnet
console. Then in that case, console output from non-Telnet threads will go to
the syslog output.
config DRIVER_NOTE
bool "Scheduler instrumentation driver"
default n
depends on SCHED_INSTRUMENTATION_BUFFER
---help---
Enable building a serial driver that can be used by an application to read data
from the in-memory, scheduler instrumentatin "note" buffer.
drivers/syslog/Make.defs
+2 -1
View File
@@ -37,7 +37,8 @@
############################################################################
# Include SYSLOG Infrastructure
CSRCS += vsyslog.c vlowsyslog.c syslogstream.c syslog_channel.c
CSRCS += syslog_initialize.c vsyslog.c vlowsyslog.c syslogstream.c
CSRCS += syslog_channel.c
ifeq ($(CONFIG_SYSLOG_INTBUFFER),y)
CSRCS += syslog_intbuffer.c
drivers/syslog/ramlog.c
+2 -2
View File
@@ -704,7 +704,7 @@ int ramlog_consoleinit(void)
#endif
/****************************************************************************
* Name: ramlog_sysloginit
* Name: ramlog_syslog_initialize
*
* Description:
* Use a pre-allocated RAM logging device and register it at the path
@@ -716,7 +716,7 @@ int ramlog_consoleinit(void)
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
int ramlog_sysloginit(void)
int ramlog_syslog_initialize(void)
{
/* Register the syslog character driver */
drivers/syslog/syslog.h
+29
View File
@@ -70,6 +70,35 @@ extern "C"
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: syslog_dev_initialize
*
* Description:
* Initialize to use the character device (or file) at
* CONFIG_SYSLOG_DEVPATH as the SYSLOG sink.
*
* One power up, the SYSLOG facility is non-existent or limited to very
* low-level output. This function may be called later in the
* intialization sequence after full driver support has been initialized.
* (via syslog_initialize()) It installs the configured SYSLOG drivers
* and enables full SYSLOGing capability.
*
* NOTE that this implementation excludes using a network connection as
* SYSLOG device. That would be a good extension.
*
* Input Parameters:
* None
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/
#ifdef CONFIG_SYSLOG_CHAR
int syslog_dev_initialize(void);
#endif
/****************************************************************************
* Name: syslog_add_intbuffer
*
drivers/syslog/syslog_device.c
+20 -7
View File
@@ -226,18 +226,31 @@ static inline void syslog_flush(void)
****************************************************************************/
/****************************************************************************
* Name: syslog_initialize
* Name: syslog_dev_initialize
*
* Description:
* Initialize to use the character device (or file) at
* CONFIG_SYSLOG_DEVPATH as the SYSLOG sink.
*
* One power up, the SYSLOG facility is non-existent or limited to very
* low-level output. This function may be called later in the
* intialization sequence after full driver support has been initialized.
* (via syslog_initialize()) It installs the configured SYSLOG drivers
* and enables full SYSLOGing capability.
*
* NOTE that this implementation excludes using a network connection as
* SYSLOG device. That would be a good extension.
*
* Input Parameters:
* None
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/
int syslog_initialize(void)
int syslog_dev_initialize(void)
{
int fd;
int ret;
@@ -322,9 +335,9 @@ int syslog_putc(int ch)
*
* (1) Before the SYSLOG device has been initialized. This could happen
* from debug output that occurs early in the boot sequence before
* syslog_initialize() is called (SYSLOG_UNINITIALIZED).
* syslog_dev_initialize() is called (SYSLOG_UNINITIALIZED).
* (2) While the device is being initialized. The case could happen if
* debug output is generated while syslog_initialize() executes
* debug output is generated while syslog_dev_initialize() executes
* (SYSLOG_INITIALIZING).
* (3) While we are generating SYSLOG output. The case could happen if
* debug output is generated while syslog_putc() executes
@@ -374,7 +387,7 @@ int syslog_putc(int ch)
goto errout_with_errcode;
}
/* syslog_initialize() is called as soon as enough of the operating
/* syslog_dev_initialize() is called as soon as enough of the operating
* system is in place to support the open operation... but it is
* possible that the SYSLOG device is not yet registered at that time.
* In this case, we know that the system is sufficiently initialized
@@ -390,12 +403,12 @@ int syslog_putc(int ch)
{
/* Try again to initialize the device. We may do this repeatedly
* because the log device might be something that was not ready
* the first time that syslog_initializee() was called (such as a
* the first time that syslog_dev_initializee() was called (such as a
* USB serial device that has not yet been connected or a file in
* an NFS mounted file system that has not yet been mounted).
*/
ret = syslog_initialize();
ret = syslog_dev_initialize();
if (ret < 0)
{
sched_unlock();
drivers/syslog/syslog_initialize.c
+94
View File
@@ -0,0 +1,94 @@
/****************************************************************************
* drivers/syslog/syslog_initialize.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include <nuttx/syslog/syslog.h>
#include "syslog.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: syslog_initialize
*
* Description:
* One power up, the SYSLOG facility is non-existent or limited to very
* low-level output. This function is called later in the intialization
* sequence after full driver support has been initialized. It installs
* the configured SYSLOG drivers and enables full SYSLOGing capability.
*
* Input Parameters:
* None
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/
int syslog_initialize(void)
{
int ret;
/* Not much to this yet... more is coming */
#if defined(CONFIG_SYSLOG_CHAR)
/* Enable use of a character device as the SYSLOG device */
ret = syslog_dev_initialize();
#elif defined(CONFIG_RAMLOG_SYSLOG)
/* Use the RAMLOG as the SYSLOG device */
ret = ramlog_syslog_initialize();
#else
/* Nothing needs to be done */
ret = 0;
#endif
return ret;
}
include/nuttx/syslog/ramlog.h
+2 -2
View File
@@ -183,7 +183,7 @@ int ramlog_consoleinit(void);
#endif
/****************************************************************************
* Name: ramlog_sysloginit
* Name: ramlog_syslog_initialize
*
* Description:
* Create the RAM logging device and register it at the specified path.
@@ -195,7 +195,7 @@ int ramlog_consoleinit(void);
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
int ramlog_sysloginit(void);
int ramlog_syslog_initialize(void);
#endif
#undef EXTERN
include/nuttx/syslog/syslog.h
+11 -7
View File
@@ -71,7 +71,7 @@
* CONFIG_SYSLOG_CHAR - Enable the generic character device for the SYSLOG.
* The full path to the SYSLOG device is provided by CONFIG_SYSLOG_DEVPATH.
* A valid character device must exist at this path. It will by opened
* by syslog_initialize.
* by logic in syslog_initialize() based on the current configuration.
*
* NOTE: No more than one SYSLOG device should be configured.
*/
@@ -154,11 +154,17 @@ int syslog_channel(FAR const struct syslog_channel_s *channel);
* Name: syslog_initialize
*
* Description:
* Initialize to use the character device (or file) at
* CONFIG_SYSLOG_DEVPATH as the SYSLOG sink.
* One power up, the SYSLOG facility is non-existent or limited to very
* low-level output. This function is called later in the intialization
* sequence after full driver support has been initialized. It installs
* the configured SYSLOG drivers and enables full SYSLOGing capability.
*
* NOTE that this implementation excludes using a network connection as
* SYSLOG device. That would be a good extension.
* Input Parameters:
* None
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
* Input Parameters:
* None
@@ -169,9 +175,7 @@ int syslog_channel(FAR const struct syslog_channel_s *channel);
*
****************************************************************************/
#ifdef CONFIG_SYSLOG_CHAR
int syslog_initialize(void);
#endif
/****************************************************************************
* Name: syslog_putc