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

Move stream data from TCB to task group structure.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5569 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2013-01-26 22:25:21 +00:00
parent d5582f35af
commit a71843ef91
23 changed files with 244 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libc/misc/lib_init.c
+40 -98
View File
@@ -1,7 +1,7 @@
/************************************************************
* libc/misc/lib_init.c
*
* Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -76,69 +76,35 @@ void weak_const_function lib_initialize(void)
}
#if CONFIG_NFILE_STREAMS > 0
/* The following function is called when a new TCB is allocated. It
* creates the streamlist instance that is stored in the TCB.
/* The following function is called when a new task is allocated. It
* intializes the streamlist instance that is stored in the task group.
*/
FAR struct streamlist *lib_alloclist(void)
void lib_streaminit(FAR struct streamlist *list)
{
FAR struct streamlist *list;
list = (FAR struct streamlist*)lib_zalloc(sizeof(struct streamlist));
if (list)
{
int i;
int i;
/* Start with a reference count of one */
/* Initialize the list access mutex */
list->sl_crefs = 1;
(void)sem_init(&list->sl_sem, 0, 1);
/* Initialize the list access mutex */
/* Initialize each FILE structure */
(void)sem_init(&list->sl_sem, 0, 1);
for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
{
/* Clear the IOB */
/* Initialize each FILE structure */
memset(&list->sl_streams[i], 0, sizeof(FILE));
for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
{
/* Clear the IOB */
/* Indicate not opened */
memset(&list->sl_streams[i], 0, sizeof(FILE));
list->sl_streams[i].fs_filedes = -1;
/* Indicate not opened */
/* Initialize the stream semaphore to one to support one-at-
* a-time access to private data sets.
*/
list->sl_streams[i].fs_filedes = -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]);
}
}
return list;
}
/* This function is called when a TCB is closed (such as with
* pthread_create(). It increases the reference count on the stream
* list.
*/
void lib_addreflist(FAR struct streamlist *list)
{
if (list)
{
/* Increment the reference count on the list.
* NOTE: that we disable interrupts to do this
* (vs. taking the list semaphore). We do this
* because file cleanup operations often must be
* done from the IDLE task which cannot wait
* on semaphores.
*/
register irqstate_t flags = irqsave();
list->sl_crefs++;
irqrestore(flags);
lib_sem_initialize(&list->sl_streams[i]);
}
}
@@ -149,57 +115,33 @@ void lib_addreflist(FAR struct streamlist *list)
void lib_releaselist(FAR struct streamlist *list)
{
int crefs;
if (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++)
{
/* Decrement the reference count on the list.
* NOTE: that we disable interrupts to do this
* (vs. taking the list semaphore). We do this
* because file cleanup operations often must be
* done from the IDLE task which cannot wait
* on semaphores.
*/
/* Destroy the semaphore that protects the IO buffer */
register irqstate_t flags = irqsave();
crefs = --(list->sl_crefs);
irqrestore(flags);
(void)sem_destroy(&list->sl_streams[i].fs_sem);
/* If the count decrements to zero, then there is no reference
* to the structure and it should be deallocated. Since there
* are references, it would be an error if any task still held
* a reference to the list's semaphore.
*/
/* Release the IO buffer */
if (crefs <= 0)
{
#if CONFIG_STDIO_BUFFER_SIZE > 0
int i;
if (list->sl_streams[i].fs_bufstart)
{
sched_free(list->sl_streams[i].fs_bufstart);
}
}
#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_free(list->sl_streams[i].fs_bufstart);
}
}
#endif
/* Finally, release the list itself */
sched_free(list);
}
}
}
#endif /* CONFIG_NFILE_STREAMS */
libc/stdio/lib_libflushall.c
+1 -1
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* libc/stdio/lib_libflushall.c
*
* Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without