1 files changed, 38 insertions, 96 deletions

diff --git a/nuttx/libc/misc/lib_init.c b/nuttx/libc/misc/lib_init.c
index 6a120f7b1..434c46505 100644
--- a/nuttx/libc/misc/lib_init.c
+++ b/nuttx/libc/misc/lib_init.c
@@ -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;
-
-      /* Start with a reference count of one */
-
-      list->sl_crefs = 1;
+  int i;
 
-      /* 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);
 
-      /* Initialize each FILE structure */
+  /* Initialize each FILE structure */
 
-      for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
-       {
-         /* Clear the IOB */
+  for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
+   {
+     /* Clear the IOB */
 
-          memset(&list->sl_streams[i], 0, sizeof(FILE));
+      memset(&list->sl_streams[i], 0, sizeof(FILE));
 
-          /* Indicate not opened */
+      /* Indicate not opened */
 
-          list->sl_streams[i].fs_filedes = -1;
+      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;
+      /* Initialize the stream semaphore to one to support one-at-
+       * a-time access to private data sets.
+       */
 
-}
-
-/* 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)
-    {
-       /* 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.
-        */
-
-       register irqstate_t flags = irqsave();
-       crefs = --(list->sl_crefs);
-       irqrestore(flags);
-
-       /* 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.
-        */
-
-       if (crefs <= 0)
-          {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-            int i;
+  int i;
 #endif
-            /* Destroy the semaphore and release the filelist */
 
-            (void)sem_destroy(&list->sl_sem);
+  DEBUGASSERT(list);
+
+  /* Destroy the semaphore and release the filelist */
 
-            /* Release each stream in the list */
+  (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 */
+  for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
+    {
+      /* Destroy the semaphore that protects the IO buffer */
 
-            sched_free(list);
-         }
-     }
+      (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
 }
 
 #endif /* CONFIG_NFILE_STREAMS */