OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

stream: Rename syslogstream to syslograwstream 

to prepare a new stream implementation of syslog

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-05-23 22:06:32 +08:00 committed by Xiang Xiao
parent f75adacea6
commit 20ea607bd0
5 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/note/notesnap_driver.c
View File

@ -434,8 +434,8 @@ void notesnap_dump_with_stream(FAR struct lib_outstream_s *stream)
void notesnap_dump(void)
{
struct lib_syslogstream_s stream;
lib_syslogstream_open(&stream);
struct lib_syslograwstream_s stream;
lib_syslograwstream_open(&stream);
notesnap_dump_with_stream(&stream.public);
lib_syslogstream_close(stream);
lib_syslograwstream_close(stream);
}

6
drivers/syslog/vsyslog.c
View File

@ -80,7 +80,7 @@ static FAR const char * const g_priority_str[] =
int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap)
{
struct lib_syslogstream_s stream;
struct lib_syslograwstream_s stream;
int ret;
#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_SYSLOG_PROCESS_NAME)
FAR struct tcb_s *tcb = nxsched_get_tcb(nxsched_gettid());
@ -100,7 +100,7 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap)
* do the work.
*/
lib_syslogstream_open(&stream);
lib_syslograwstream_open(&stream);
#ifdef CONFIG_SYSLOG_TIMESTAMP
ts.tv_sec = 0;
@ -263,6 +263,6 @@ int nx_vsyslog(int priority, FAR const IPTR char *fmt, FAR va_list *ap)
/* Flush and destroy the syslog stream buffer */
lib_syslogstream_close(&stream);
lib_syslograwstream_close(&stream);
return ret;
}

16
include/nuttx/streams.h
View File

@ -232,7 +232,7 @@ struct lib_bufferedoutstream_s
struct iob_s; /* Forward reference */
struct lib_syslogstream_s
struct lib_syslograwstream_s
{
struct lib_outstream_s public;
#ifdef CONFIG_SYSLOG_BUFFER
@ -459,7 +459,7 @@ void lib_nullinstream(FAR struct lib_instream_s *nullinstream);
void lib_nulloutstream(FAR struct lib_outstream_s *nulloutstream);
/****************************************************************************
* Name: lib_syslogstream_open
* Name: lib_syslograwstream_open
*
* Description:
* Initializes a stream for use with the configured syslog interface.
@ -467,24 +467,24 @@ void lib_nulloutstream(FAR struct lib_outstream_s *nulloutstream);
*
* Input Parameters:
* stream - User allocated, uninitialized instance of struct
* lib_syslogstream_s to be initialized.
* lib_syslograwstream_s to be initialized.
*
* Returned Value:
* None (User allocated instance initialized).
*
****************************************************************************/
void lib_syslogstream_open(FAR struct lib_syslogstream_s *stream);
void lib_syslograwstream_open(FAR struct lib_syslograwstream_s *stream);
/****************************************************************************
* Name: lib_syslogstream_close
* Name: lib_syslograwstream_close
*
* Description:
* Free resources held by the syslog stream.
*
* Input Parameters:
* stream - User allocated, uninitialized instance of struct
* lib_syslogstream_s to be initialized.
* lib_syslograwstream_s to be initialized.
*
* Returned Value:
* None (Resources freed).
@ -492,9 +492,9 @@ void lib_syslogstream_open(FAR struct lib_syslogstream_s *stream);
****************************************************************************/
#ifdef CONFIG_SYSLOG_BUFFER
void lib_syslogstream_close(FAR struct lib_syslogstream_s *stream);
void lib_syslograwstream_close(FAR struct lib_syslograwstream_s *stream);
#else
# define lib_syslogstream_close(s)
# define lib_syslograwstream_close(s)
#endif
/****************************************************************************

2
libs/libc/stream/Make.defs
View File

@ -26,7 +26,7 @@ CSRCS += lib_memsostream.c lib_lowoutstream.c lib_rawinstream.c
CSRCS += lib_rawoutstream.c lib_rawsistream.c lib_rawsostream.c
CSRCS += lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c
CSRCS += lib_mtdoutstream.c lib_libnoflush.c lib_libsnoflush.c
CSRCS += lib_syslogstream.c lib_bufferedoutstream.c
CSRCS += lib_syslograwstream.c lib_bufferedoutstream.c
# The remaining sources files depend upon C streams

61
libs/libc/stream/lib_syslogstream.c → libs/libc/stream/lib_syslograwstream.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/stream/lib_syslogstream.c
* libs/libc/stream/lib_syslograwstream.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -36,12 +36,12 @@
#ifdef CONFIG_SYSLOG_BUFFER
/****************************************************************************
* Name: syslogstream_flush
* Name: syslograwstream_flush
****************************************************************************/
static int syslogstream_flush(FAR struct lib_outstream_s *ostream)
static int syslograwstream_flush(FAR struct lib_outstream_s *ostream)
{
FAR struct lib_syslogstream_s *stream = (FAR void *)ostream;
FAR struct lib_syslograwstream_s *stream = (FAR void *)ostream;
int ret = OK;
DEBUGASSERT(stream != NULL);
@ -72,10 +72,10 @@ static int syslogstream_flush(FAR struct lib_outstream_s *ostream)
}
/****************************************************************************
* Name: syslogstream_addchar
* Name: syslograwstream_addchar
****************************************************************************/
static void syslogstream_addchar(FAR struct lib_syslogstream_s *stream,
static void syslograwstream_addchar(FAR struct lib_syslograwstream_s *stream,
int ch)
{
/* Add the incoming character to the buffer */
@ -93,15 +93,16 @@ static void syslogstream_addchar(FAR struct lib_syslogstream_s *stream,
{
/* Yes.. then flush the buffer */
syslogstream_flush(&stream->public);
syslograwstream_flush(&stream->public);
}
}
/****************************************************************************
* Name: syslogstream_addstring
* Name: syslograwstream_addstring
****************************************************************************/
static int syslogstream_addstring(FAR struct lib_syslogstream_s *stream,
static int
syslograwstream_addstring(FAR struct lib_syslograwstream_s *stream,
FAR const char *buff, int len)
{
int ret = 0;
@ -120,7 +121,7 @@ static int syslogstream_addstring(FAR struct lib_syslogstream_s *stream,
{
/* Yes.. then flush the buffer */
syslogstream_flush(&stream->public);
syslograwstream_flush(&stream->public);
}
}
while (ret < len);
@ -133,13 +134,13 @@ static int syslogstream_addstring(FAR struct lib_syslogstream_s *stream,
#endif
/****************************************************************************
* Name: syslogstream_putc
* Name: syslograwstream_putc
****************************************************************************/
static void syslogstream_putc(FAR struct lib_outstream_s *this, int ch)
static void syslograwstream_putc(FAR struct lib_outstream_s *this, int ch)
{
FAR struct lib_syslogstream_s *stream =
(FAR struct lib_syslogstream_s *)this;
FAR struct lib_syslograwstream_s *stream =
(FAR struct lib_syslograwstream_s *)this;
DEBUGASSERT(stream != NULL);
stream->last_ch = ch;
@ -155,7 +156,7 @@ static void syslogstream_putc(FAR struct lib_outstream_s *this, int ch)
{
/* Add the incoming character to the buffer */
syslogstream_addchar(stream, ch);
syslograwstream_addchar(stream, ch);
}
else
# endif
@ -189,11 +190,11 @@ static void syslogstream_putc(FAR struct lib_outstream_s *this, int ch)
}
}
static int syslogstream_puts(FAR struct lib_outstream_s *this,
static int syslograwstream_puts(FAR struct lib_outstream_s *this,
FAR const void *buff, int len)
{
FAR struct lib_syslogstream_s *stream =
(FAR struct lib_syslogstream_s *)this;
FAR struct lib_syslograwstream_s *stream =
(FAR struct lib_syslograwstream_s *)this;
int ret;
DEBUGASSERT(stream != NULL);
@ -212,7 +213,7 @@ static int syslogstream_puts(FAR struct lib_outstream_s *this,
{
/* Add the incoming string to the buffer */
ret = syslogstream_addstring(stream, buff, len);
ret = syslograwstream_addstring(stream, buff, len);
}
else
#endif
@ -250,7 +251,7 @@ static int syslogstream_puts(FAR struct lib_outstream_s *this,
****************************************************************************/
/****************************************************************************
* Name: lib_syslogstream_open
* Name: lib_syslograwstream_open
*
* Description:
* Initializes a stream for use with the configured syslog interface.
@ -258,25 +259,25 @@ static int syslogstream_puts(FAR struct lib_outstream_s *this,
*
* Input Parameters:
* stream - User allocated, uninitialized instance of struct
* lib_syslogstream_s to be initialized.
* lib_syslograwstream_s to be initialized.
*
* Returned Value:
* None (User allocated instance initialized).
*
****************************************************************************/
void lib_syslogstream_open(FAR struct lib_syslogstream_s *stream)
void lib_syslograwstream_open(FAR struct lib_syslograwstream_s *stream)
{
DEBUGASSERT(stream != NULL);
/* Initialize the common fields */
stream->public.putc = syslogstream_putc;
stream->public.puts = syslogstream_puts;
stream->public.putc = syslograwstream_putc;
stream->public.puts = syslograwstream_puts;
stream->public.nput = 0;
#ifdef CONFIG_SYSLOG_BUFFER
stream->public.flush = syslogstream_flush;
stream->public.flush = syslograwstream_flush;
/* Allocate an IOB */
@ -298,14 +299,14 @@ void lib_syslogstream_open(FAR struct lib_syslogstream_s *stream)
}
/****************************************************************************
* Name: lib_syslogstream_close
* Name: lib_syslograwstream_close
*
* Description:
* Free resources held by the syslog stream.
*
* Input Parameters:
* stream - User allocated, uninitialized instance of struct
* lib_syslogstream_s to be initialized.
* lib_syslograwstream_s to be initialized.
*
* Returned Value:
* None (Resources freed).
@ -313,7 +314,7 @@ void lib_syslogstream_open(FAR struct lib_syslogstream_s *stream)
****************************************************************************/
#ifdef CONFIG_SYSLOG_BUFFER
void lib_syslogstream_close(FAR struct lib_syslogstream_s *stream)
void lib_syslograwstream_close(FAR struct lib_syslograwstream_s *stream)
{
DEBUGASSERT(stream != NULL);
@ -324,7 +325,7 @@ void lib_syslogstream_close(FAR struct lib_syslogstream_s *stream)
{
/* Flush the output buffered in the IOB */
syslogstream_flush(&stream->public);
syslograwstream_flush(&stream->public);
/* Free the IOB */
@ -332,7 +333,7 @@ void lib_syslogstream_close(FAR struct lib_syslogstream_s *stream)
stream->iob = NULL;
}
# else
syslogstream_flush(&stream->public);
syslograwstream_flush(&stream->public);
# endif
}
#endif