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

Rename some functions and reshuffling some paramters

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-11 08:37:06 -06:00
parent a0c22020be
commit 44499ed46c
5 changed files with 76 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/nuttx/lib.h
View File

@ -2,7 +2,7 @@
* include/nuttx/lib.h * include/nuttx/lib.h
* Non-standard, internal APIs available in lib/. * 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 <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -56,7 +56,8 @@
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@ -68,9 +69,11 @@ extern "C" {
/* Functions contained in lib_init.c ****************************************/ /* Functions contained in lib_init.c ****************************************/
void weak_function lib_initialize(void); void weak_function lib_initialize(void);
#if CONFIG_NFILE_STREAMS > 0 #if CONFIG_NFILE_STREAMS > 0
void lib_streaminit(FAR struct streamlist *list); struct task_group_s;
void lib_releaselist(FAR struct streamlist *list); void lib_stream_initialize(FAR struct task_group_s *group);
void lib_stream_release(FAR struct task_group_s *group);
#endif #endif
#undef EXTERN #undef EXTERN

4
libc/misc/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# libc/misc/Make.defs # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,7 +35,7 @@
# Add the internal C files to the build # 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 # Add C files that depend on file OR socket descriptors

101
libc/misc/lib_init.c → libc/misc/lib_stream.c
View File

@ -1,7 +1,7 @@
/************************************************************ /****************************************************************************
* libc/misc/lib_init.c * libc/misc/lib_stream.c
* *
* Copyright (C) 2007, 2011, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2011, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************/ ****************************************************************************/
/************************************************************ /****************************************************************************
* Included Files * Included Files
************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
@ -44,53 +44,67 @@
#include <errno.h> #include <errno.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <nuttx/sched.h>
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#include <nuttx/lib.h> #include <nuttx/lib.h>
#include "lib_internal.h" #include "lib_internal.h"
#if !defined(CONFIG_BUILD_PROTECTED) || defined(__KERNEL__) || \ #if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \
defined(CONFIG_BUILD_KERNEL) defined(__KERNEL__)
/************************************************************ /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************/ ****************************************************************************/
/************************************************************ /****************************************************************************
* Private Variables * Private Variables
************************************************************/ ****************************************************************************/
/************************************************************ /****************************************************************************
* Private Functions * Private Functions
************************************************************/ ****************************************************************************/
/************************************************************ /****************************************************************************
* Public Functions * Public Functions
************************************************************/ ****************************************************************************/
/************************************************************ /****************************************************************************
* Name: lib_initialize * Name: lib_initialize
************************************************************/ *
* Description:
/* General library initialization hook */ * General library initialization hook
*
****************************************************************************/
void weak_const_function lib_initialize(void) void weak_const_function lib_initialize(void)
{ {
} }
/************************************************************ /****************************************************************************
* Name: lib_streaminit * 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 #if CONFIG_NFILE_STREAMS > 0
/* The following function is called when a new task is allocated. It void lib_stream_initialize(FAR struct task_group_s *group)
* initializees the streamlist instance that is stored in the task group.
*/
void lib_streaminit(FAR struct streamlist *list)
{ {
FAR struct streamlist *list;
int i; 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 */ /* Initialize the list access mutex */
(void)sem_init(&list->sl_sem, 0, 1); (void)sem_init(&list->sl_sem, 0, 1);
@ -114,19 +128,34 @@ void lib_streaminit(FAR struct streamlist *list)
lib_sem_initialize(&list->sl_streams[i]); lib_sem_initialize(&list->sl_streams[i]);
} }
} }
#endif /* CONFIG_NFILE_STREAMS > 0 */
/* This function is called when a TCB is destroyed. Note that is /****************************************************************************
* does not close the files by releasing the inode. This happens * Name: lib_stream_init
* separately when the file descriptor list is freed. *
*/ * 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.
*
****************************************************************************/
void lib_releaselist(FAR struct streamlist *list) #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 #if CONFIG_STDIO_BUFFER_SIZE > 0
int i; int i;
#endif #endif
DEBUGASSERT(list); #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 */ /* Destroy the semaphore and release the filelist */
@ -150,6 +179,6 @@ void lib_releaselist(FAR struct streamlist *list)
} }
#endif #endif
} }
#endif /* CONFIG_NFILE_STREAMS > 0 */
#endif /* !CONFIG_BUILD_PROTECTED || __KERNEL__ || CONFIG_BUILD_KERNEL */ #endif /* (!CONFIG_BUILD_PROTECTED &&7 !CONFIG_BUILD_KERNEL) || __KERNEL__ */
#endif /* CONFIG_NFILE_STREAMS */

7
sched/group/group_leave.c
View File

@ -181,12 +181,7 @@ static inline void group_release(FAR struct task_group_s *group)
#if CONFIG_NFILE_STREAMS > 0 #if CONFIG_NFILE_STREAMS > 0
/* Free resource held by the stream list */ /* Free resource held by the stream list */
#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ lib_stream_release(group);
defined(CONFIG_MM_KERNEL_HEAP)
lib_releaselist(group->tg_streamlist);
#else
lib_releaselist(&group->tg_streamlist);
#endif
#endif /* CONFIG_NFILE_STREAMS */ #endif /* CONFIG_NFILE_STREAMS */
#endif /* CONFIG_NFILE_DESCRIPTORS */ #endif /* CONFIG_NFILE_DESCRIPTORS */

7
sched/group/group_setupstreams.c
View File

@ -78,12 +78,7 @@ int group_setupstreams(FAR struct task_tcb_s *tcb)
/* Initialize file streams for the task group */ /* Initialize file streams for the task group */
#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ lib_stream_initialize(tcb->cmn.group);
defined(CONFIG_MM_KERNEL_HEAP)
lib_streaminit(tcb->cmn.group->tg_streamlist);
#else
lib_streaminit(&tcb->cmn.group->tg_streamlist);
#endif
/* fdopen to get the stdin, stdout and stderr streams. The following logic /* 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. * depends on the fact that the library layer will allocate FILEs in order.