Move file data from TCB to task group

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5567 42af7a65-404d-4744-a932-0658087f49c3

8 files changed, 27 insertions, 40 deletions

diff --git a/nuttx/arch/arm/src/common/up_exit.c b/nuttx/arch/arm/src/common/up_exit.c
index 6f6d54f76..5b469fd03 100644
--- a/nuttx/arch/arm/src/common/up_exit.c
+++ b/nuttx/arch/arm/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_exit.c
  *
- *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 201-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,12 +85,10 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      sdbg("    filelist refcount=%d\n",
-           tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               sdbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/avr/src/common/up_exit.c b/nuttx/arch/avr/src/common/up_exit.c
index 0a8cc0d18..0813754a0 100644
--- a/nuttx/arch/avr/src/common/up_exit.c
+++ b/nuttx/arch/avr/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/common/up_exit.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,12 +85,10 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      sdbg("    filelist refcount=%d\n",
-           tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               sdbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/hc/src/common/up_exit.c b/nuttx/arch/hc/src/common/up_exit.c
index 7cd16b438..5313a1172 100644
--- a/nuttx/arch/hc/src/common/up_exit.c
+++ b/nuttx/arch/hc/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/hc/src/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
@@ -85,12 +85,10 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      sdbg("    filelist refcount=%d\n",
-           tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               sdbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/mips/src/common/up_exit.c b/nuttx/arch/mips/src/common/up_exit.c
index 876b486b6..5a7b68a99 100644
--- a/nuttx/arch/mips/src/common/up_exit.c
+++ b/nuttx/arch/mips/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/mips/src/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
@@ -87,12 +87,10 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      sdbg("    filelist refcount=%d\n",
-           tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               sdbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/sh/src/common/up_exit.c b/nuttx/arch/sh/src/common/up_exit.c
index 84a44a705..af270b335 100644
--- a/nuttx/arch/sh/src/common/up_exit.c
+++ b/nuttx/arch/sh/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_exit.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,16 +81,15 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 #endif
 
   sdbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      sdbg("    filelist refcount=%d\n",
-           tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               sdbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/x86/src/common/up_exit.c b/nuttx/arch/x86/src/common/up_exit.c
index e3d27b0af..6a98c7dd0 100644
--- a/nuttx/arch/x86/src/common/up_exit.c
+++ b/nuttx/arch/x86/src/common/up_exit.c
@@ -85,12 +85,10 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      sdbg("    filelist refcount=%d\n",
-           tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               sdbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/z16/src/common/up_exit.c b/nuttx/arch/z16/src/common/up_exit.c
index 41f058347..ad0c55eed 100644
--- a/nuttx/arch/z16/src/common/up_exit.c
+++ b/nuttx/arch/z16/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_exit.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,17 +81,16 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
   int i;
 #endif
 
-  dbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  lldbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  lldbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      lldbg("    filelist refcount=%d\n",
-            tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               lldbg("      fd=%d refcount=%d\n",
diff --git a/nuttx/arch/z80/src/common/up_exit.c b/nuttx/arch/z80/src/common/up_exit.c
index 85ddd841e..50289f52b 100644
--- a/nuttx/arch/z80/src/common/up_exit.c
+++ b/nuttx/arch/z80/src/common/up_exit.c
@@ -82,17 +82,16 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
   int i;
 #endif
 
-  dbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  lldbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  lldbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   if (tcb->filelist)
     {
-      lldbg("    filelist refcount=%d\n",
-            tcb->filelist->fl_crefs);
-
+      FAR struct filelist *list = tcb->group->tg_filelist;
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
-          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          struct inode *inode = list->fl_files[i].f_inode;
           if (inode)
             {
               lldbg("      fd=%d refcount=%d\n",