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

syslog: If syslog timestamping is enabled, don't try to get the time if the timer hardware has not yet been initialized.

Browse Source
This commit is contained in:
Gregory Nutt 2016-02-05 08:36:43 -06:00
parent 2dc258986d
commit 8a9fa634bf
2 changed files with 28 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -11456,3 +11456,6 @@
some logic that may attempt to run early in the start-up sequence but
cannot run if a sufficient level of initialization has not yet occurred
(2016-02-05).
* libc/syslog/lib_syslog.c: If syslog timestamping is enabled, don't try to
get the time if the timer hardware has not yet been initialized
(2016-02-05).

82
libc/syslog/lib_syslog.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* libc/syslog/lib_syslog.c
*
* Copyright (C) 2007-2009, 2011-2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011-2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -42,43 +42,12 @@
#include <stdio.h>
#include <syslog.h>
#include <nuttx/init.h>
#include <nuttx/clock.h>
#include <nuttx/streams.h>
#include "syslog/syslog.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Type Declarations
****************************************************************************/
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Public Constant Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Constant Data
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
@ -104,11 +73,19 @@ static inline int vsyslog_internal(FAR const IPTR char *fmt, va_list ap)
#if defined(CONFIG_SYSLOG_TIMESTAMP)
struct timespec ts;
int ret;
/* Get the current time */
/* Get the current time. Since debug output may be generated very early
* in the start-up sequence, hardware timer support may not yet be
* available.
*/
ret = clock_systimespec(&ts);
if (!OSINIT_HW_READY() || clock_systimespec(&ts) < 0)
{
/* Timer hardware is not available, or clock_systimespec failed */
ts.tv_sec = 0;
ts.tv_nsec = 0;
}
#endif
#if defined(CONFIG_SYSLOG)
@ -119,14 +96,11 @@ static inline int vsyslog_internal(FAR const IPTR char *fmt, va_list ap)
lib_syslogstream((FAR struct lib_outstream_s *)&stream);
#if defined(CONFIG_SYSLOG_TIMESTAMP)
/* Pre-pend the message with the current time */
/* Pre-pend the message with the current time, if available */
(void)lib_sprintf((FAR struct lib_outstream_s *)&stream,
"[%6d.%06d]", ts.tv_sec, ts.tv_nsec/1000);
if (ret == OK)
{
(void)lib_sprintf((FAR struct lib_outstream_s *)&stream,
"[%6d.%06d]",
ts.tv_sec, ts.tv_nsec/1000);
}
#endif
return lib_vsprintf((FAR struct lib_outstream_s *)&stream, fmt, ap);
@ -139,14 +113,10 @@ static inline int vsyslog_internal(FAR const IPTR char *fmt, va_list ap)
lib_rawoutstream(&stream, 1);
#if defined(CONFIG_SYSLOG_TIMESTAMP)
/* Pre-pend the message with the current time */
/* Pre-pend the message with the current time, if available */
if (ret == OK)
{
(void)lib_sprintf((FAR struct lib_outstream_s *)&stream,
"[%6d.%06d]",
ts.tv_sec, ts.tv_nsec/1000);
}
(void)lib_sprintf((FAR struct lib_outstream_s *)&stream,
"[%6d.%06d]", ts.tv_sec, ts.tv_nsec/1000);
#endif
return lib_vsprintf(&stream.public, fmt, ap);
@ -159,20 +129,18 @@ static inline int vsyslog_internal(FAR const IPTR char *fmt, va_list ap)
lib_lowoutstream((FAR struct lib_outstream_s *)&stream);
#if defined(CONFIG_SYSLOG_TIMESTAMP)
/* Pre-pend the message with the current time */
/* Pre-pend the message with the current time, if available */
if (ret == OK)
{
(void)lib_sprintf((FAR struct lib_outstream_s *)&stream,
"[%6d.%06d]",
ts.tv_sec, ts.tv_nsec/1000);
}
(void)lib_sprintf((FAR struct lib_outstream_s *)&stream,
"[%6d.%06d]", ts.tv_sec, ts.tv_nsec/1000);
#endif
return lib_vsprintf((FAR struct lib_outstream_s *)&stream, fmt, ap);
#else /* CONFIG_SYSLOG */
return 0;
#endif /* CONFIG_SYSLOG */
}