From 43108346e9ef40deb13ff1c5a817aa4764ab5891 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 11 Sep 2014 08:37:06 -0600 Subject: Rename some functions and reshuffling some paramters --- nuttx/include/nuttx/lib.h | 11 +- nuttx/libc/misc/Make.defs | 4 +- nuttx/libc/misc/lib_init.c | 155 --------------------------- nuttx/libc/misc/lib_stream.c | 184 +++++++++++++++++++++++++++++++++ nuttx/sched/group/group_leave.c | 7 +- nuttx/sched/group/group_setupstreams.c | 7 +- 6 files changed, 195 insertions(+), 173 deletions(-) delete mode 100644 nuttx/libc/misc/lib_init.c create mode 100644 nuttx/libc/misc/lib_stream.c (limited to 'nuttx') diff --git a/nuttx/include/nuttx/lib.h b/nuttx/include/nuttx/lib.h index 3bc581e18..5b151ed9e 100644 --- a/nuttx/include/nuttx/lib.h +++ b/nuttx/include/nuttx/lib.h @@ -2,7 +2,7 @@ * include/nuttx/lib.h * Non-standard, internal APIs available in lib/. * - * Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -56,7 +56,8 @@ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -68,9 +69,11 @@ extern "C" { /* Functions contained in lib_init.c ****************************************/ void weak_function lib_initialize(void); + #if CONFIG_NFILE_STREAMS > 0 -void lib_streaminit(FAR struct streamlist *list); -void lib_releaselist(FAR struct streamlist *list); +struct task_group_s; +void lib_stream_initialize(FAR struct task_group_s *group); +void lib_stream_release(FAR struct task_group_s *group); #endif #undef EXTERN diff --git a/nuttx/libc/misc/Make.defs b/nuttx/libc/misc/Make.defs index 20b1dc1d0..6a2bd63e4 100644 --- a/nuttx/libc/misc/Make.defs +++ b/nuttx/libc/misc/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # libc/misc/Make.defs # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ # Add the internal C files to the build -CSRCS += lib_init.c lib_filesem.c +CSRCS += lib_stream.c lib_filesem.c # Add C files that depend on file OR socket descriptors diff --git a/nuttx/libc/misc/lib_init.c b/nuttx/libc/misc/lib_init.c deleted file mode 100644 index f4f4e5b6e..000000000 --- a/nuttx/libc/misc/lib_init.c +++ /dev/null @@ -1,155 +0,0 @@ -/************************************************************ - * libc/misc/lib_init.c - * - * Copyright (C) 2007, 2011, 2013 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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 - -#include -#include -#include - -#include -#include -#include - -#include "lib_internal.h" - -#if !defined(CONFIG_BUILD_PROTECTED) || defined(__KERNEL__) || \ - defined(CONFIG_BUILD_KERNEL) - -/************************************************************ - * Pre-processor Definitions - ************************************************************/ - -/************************************************************ - * Private Variables - ************************************************************/ - -/************************************************************ - * Private Functions - ************************************************************/ - -/************************************************************ - * Public Functions - ************************************************************/ - -/************************************************************ - * Name: lib_initialize - ************************************************************/ - -/* General library initialization hook */ - -void weak_const_function lib_initialize(void) -{ -} - -/************************************************************ - * Name: lib_streaminit - ************************************************************/ - -#if CONFIG_NFILE_STREAMS > 0 -/* The following function is called when a new task is allocated. It - * initializees the streamlist instance that is stored in the task group. - */ - -void lib_streaminit(FAR struct streamlist *list) -{ - int i; - - /* Initialize the list access mutex */ - - (void)sem_init(&list->sl_sem, 0, 1); - - /* Initialize each FILE structure */ - - for (i = 0; i < CONFIG_NFILE_STREAMS; i++) - { - /* Clear the IOB */ - - memset(&list->sl_streams[i], 0, sizeof(FILE)); - - /* Indicate not opened */ - - list->sl_streams[i].fs_fd = -1; - - /* Initialize the stream semaphore to one to support one-at- - * a-time access to private data sets. - */ - - lib_sem_initialize(&list->sl_streams[i]); - } -} - -/* This function is called when a TCB is destroyed. Note that is - * does not close the files by releasing the inode. This happens - * separately when the file descriptor list is freed. - */ - -void lib_releaselist(FAR struct streamlist *list) -{ -#if CONFIG_STDIO_BUFFER_SIZE > 0 - int i; -#endif - - DEBUGASSERT(list); - - /* Destroy the semaphore and release the filelist */ - - (void)sem_destroy(&list->sl_sem); - - /* Release each stream in the list */ - -#if CONFIG_STDIO_BUFFER_SIZE > 0 - for (i = 0; i < CONFIG_NFILE_STREAMS; i++) - { - /* Destroy the semaphore that protects the IO buffer */ - - (void)sem_destroy(&list->sl_streams[i].fs_sem); - - /* Release the IO buffer */ - - if (list->sl_streams[i].fs_bufstart) - { - sched_ufree(list->sl_streams[i].fs_bufstart); - } - } -#endif -} - -#endif /* !CONFIG_BUILD_PROTECTED || __KERNEL__ || CONFIG_BUILD_KERNEL */ -#endif /* CONFIG_NFILE_STREAMS */ diff --git a/nuttx/libc/misc/lib_stream.c b/nuttx/libc/misc/lib_stream.c new file mode 100644 index 000000000..5b42f0c01 --- /dev/null +++ b/nuttx/libc/misc/lib_stream.c @@ -0,0 +1,184 @@ +/**************************************************************************** + * libc/misc/lib_stream.c + * + * Copyright (C) 2007, 2011, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include +#include +#include + +#include +#include +#include +#include + +#include "lib_internal.h" + +#if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \ + defined(__KERNEL__) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Variables + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: lib_initialize + * + * Description: + * General library initialization hook + * + ****************************************************************************/ + +void weak_const_function lib_initialize(void) +{ +} + +/**************************************************************************** + * Name: lib_stream_initialize + * + * Description: + * This function is called when a new task is allocated. It initializes + * the streamlist instance that is stored in the task group. + * + ****************************************************************************/ + +#if CONFIG_NFILE_STREAMS > 0 +void lib_stream_initialize(FAR struct task_group_s *group) +{ + FAR struct streamlist *list; + int i; + +#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ + defined(CONFIG_MM_KERNEL_HEAP) + DEBUGASSERT(group && group->tg_streamlist); + list = group->tg_streamlist; +#else + DEBUGASSERT(group); + list = &group->tg_streamlist; +#endif + + /* Initialize the list access mutex */ + + (void)sem_init(&list->sl_sem, 0, 1); + + /* Initialize each FILE structure */ + + for (i = 0; i < CONFIG_NFILE_STREAMS; i++) + { + /* Clear the IOB */ + + memset(&list->sl_streams[i], 0, sizeof(FILE)); + + /* Indicate not opened */ + + list->sl_streams[i].fs_fd = -1; + + /* Initialize the stream semaphore to one to support one-at- + * a-time access to private data sets. + */ + + lib_sem_initialize(&list->sl_streams[i]); + } +} +#endif /* CONFIG_NFILE_STREAMS > 0 */ + +/**************************************************************************** + * Name: lib_stream_init + * + * Description: + * This function is called when a TCB is destroyed. Note that it does not + * close the files by releasing the inode. That happens separately when + * the file descriptor list is freed. + * + ****************************************************************************/ + +#if CONFIG_NFILE_STREAMS > 0 +void lib_stream_release(FAR struct task_group_s *group) +{ + FAR struct streamlist *list; +#if CONFIG_STDIO_BUFFER_SIZE > 0 + int i; +#endif + +#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ + defined(CONFIG_MM_KERNEL_HEAP) + DEBUGASSERT(group && group->tg_streamlist); + list = group->tg_streamlist; +#else + DEBUGASSERT(group); + list = &group->tg_streamlist; +#endif + + /* Destroy the semaphore and release the filelist */ + + (void)sem_destroy(&list->sl_sem); + + /* Release each stream in the list */ + +#if CONFIG_STDIO_BUFFER_SIZE > 0 + for (i = 0; i < CONFIG_NFILE_STREAMS; i++) + { + /* Destroy the semaphore that protects the IO buffer */ + + (void)sem_destroy(&list->sl_streams[i].fs_sem); + + /* Release the IO buffer */ + + if (list->sl_streams[i].fs_bufstart) + { + sched_ufree(list->sl_streams[i].fs_bufstart); + } + } +#endif +} +#endif /* CONFIG_NFILE_STREAMS > 0 */ + +#endif /* (!CONFIG_BUILD_PROTECTED &&7 !CONFIG_BUILD_KERNEL) || __KERNEL__ */ diff --git a/nuttx/sched/group/group_leave.c b/nuttx/sched/group/group_leave.c index 36b84c836..bcf9e1dae 100644 --- a/nuttx/sched/group/group_leave.c +++ b/nuttx/sched/group/group_leave.c @@ -181,12 +181,7 @@ static inline void group_release(FAR struct task_group_s *group) #if CONFIG_NFILE_STREAMS > 0 /* Free resource held by the stream list */ -#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ - defined(CONFIG_MM_KERNEL_HEAP) - lib_releaselist(group->tg_streamlist); -#else - lib_releaselist(&group->tg_streamlist); -#endif + lib_stream_release(group); #endif /* CONFIG_NFILE_STREAMS */ #endif /* CONFIG_NFILE_DESCRIPTORS */ diff --git a/nuttx/sched/group/group_setupstreams.c b/nuttx/sched/group/group_setupstreams.c index 24254dcdd..72fc12dd6 100644 --- a/nuttx/sched/group/group_setupstreams.c +++ b/nuttx/sched/group/group_setupstreams.c @@ -78,12 +78,7 @@ int group_setupstreams(FAR struct task_tcb_s *tcb) /* Initialize file streams for the task group */ -#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ - defined(CONFIG_MM_KERNEL_HEAP) - lib_streaminit(tcb->cmn.group->tg_streamlist); -#else - lib_streaminit(&tcb->cmn.group->tg_streamlist); -#endif + lib_stream_initialize(tcb->cmn.group); /* fdopen to get the stdin, stdout and stderr streams. The following logic * depends on the fact that the library layer will allocate FILEs in order. -- cgit v1.2.3