From 75f185244fbd0892fdb26443eda666ce21c417ec Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 26 Jan 2013 22:25:21 +0000
Subject: Move stream data from TCB to task group structure.

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5569 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/arch/x86/src/common/up_exit.c | 44 +++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

(limited to 'nuttx/arch/x86')

diff --git a/nuttx/arch/x86/src/common/up_exit.c b/nuttx/arch/x86/src/common/up_exit.c
index 6a98c7dd0..dee6f7d49 100644
--- a/nuttx/arch/x86/src/common/up_exit.c
+++ b/nuttx/arch/x86/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_exit.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,11 @@
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
 static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NFILE_STREAMS > 0
+#if CONFIG_NFILE_DESCRIPTORS > 0
+  FAR struct filelist *filelist;
+#if CONFIG_NFILE_STREAMS > 0
+  FAR struct streamlist *streamlist;
+#endif
   int i;
 #endif
 
@@ -83,40 +87,32 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
   sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
-  if (tcb->filelist)
+  filelist = tcb->group->tg_filelist;
+  for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
-      FAR struct filelist *list = tcb->group->tg_filelist;
-      for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
+      struct inode *inode = filelist->fl_files[i].f_inode;
+      if (inode)
         {
-          struct inode *inode = list->fl_files[i].f_inode;
-          if (inode)
-            {
-              sdbg("      fd=%d refcount=%d\n",
-                   i, inode->i_crefs);
-            }
+          sdbg("      fd=%d refcount=%d\n",
+               i, inode->i_crefs);
         }
     }
 #endif
 
 #if CONFIG_NFILE_STREAMS > 0
-  if (tcb->streams)
+  streamlist = tcb->group->tg_streamlist;
+  for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
     {
-      sdbg("    streamlist refcount=%d\n",
-           tcb->streams->sl_crefs);
-
-      for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
+      struct file_struct *filep = &streamlist->sl_streams[i];
+      if (filep->fs_filedes >= 0)
         {
-          struct file_struct *filep = &tcb->streams->sl_streams[i];
-          if (filep->fs_filedes >= 0)
-            {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-              sdbg("      fd=%d nbytes=%d\n",
-                   filep->fs_filedes,
-                  filep->fs_bufpos - filep->fs_bufstart);
+          sdbg("      fd=%d nbytes=%d\n",
+               filep->fs_filedes,
+               filep->fs_bufpos - filep->fs_bufstart);
 #else
-              sdbg("      fd=%d\n", filep->fs_filedes);
+          sdbg("      fd=%d\n", filep->fs_filedes);
 #endif
-            }
         }
     }
 #endif
-- 
cgit v1.2.3