Ticket #1246: PR#1246-newlib-1.15.0-rtems_stdio_cleanup.diff

 - This patch addresses rtems PR#1246 (plug memory leak when thread is deleted)
   the patch prevents the reent 'cleanup' function from performing I/O since
   __reclaim_reent() is called at a point where the thread is already quite dead.
   __reclaim_reent() should only reclaim memory and not do any I/O operations.

 - Patch affects only RTEMS (by means of #ifdef)
 - NOTE: companion patch 'rtems-newlibc-1.14.0-reclaim_reent.diff'
         for RTEMS is necessary (cpukit/libcsupport/src/newlib.c)
 - Patch assumes PR1247 patch was applied prior to this one (otherwise a minor
   warning 'hunk offset' is printed).
*** newlib-1.15.0/newlib/libc/include/sys/config.h.cleanstdio.diff.orig 2006-08-29 14:00:59.000000000 -0700
--- newlib-1.15.0/newlib/libc/include/sys/config.h      2007-06-20 17:22:52.000000000 -0700
***************
*** 182,187 ****
--- 182,188 ----
  #if defined(__rtems__)
  #define __FILENAME_MAX__ 255
  #define _READ_WRITE_RETURN_TYPE _ssize_t
+ #define _STDIO_CLEANUP_NO_IO_SYSCALLS
  #endif
  
  #ifndef __IMPORT
*** newlib-1.15.0/newlib/libc/stdio/fclose.c.cleanstdio.diff.orig       2006-12-14 14:47:12.000000000 -0800
--- newlib-1.15.0/newlib/libc/stdio/fclose.c    2007-06-20 17:22:52.000000000 -0700
***************
*** 64,69 ****
--- 64,89 ----
  #include <sys/lock.h>
  #include "local.h"
  
+ static void
+ _DEFUN(_do_reclaim_fp, (rptr, fp, is_locked),
+       struct _reent *rptr _AND
+       register FILE * fp  _AND
+         int            is_locked)
+ {
+   if (fp->_flags & __SMBF)
+     _free_r (rptr, (char *) fp->_bf._base);
+   if (HASUB (fp))
+     FREEUB (fp);
+   if (HASLB (fp))
+     FREELB (fp);
+   fp->_flags = 0;             /* release this FILE for reuse */
+   if ( is_locked )
+     _funlockfile (fp);
+ #ifndef __SINGLE_THREAD__
+   __lock_close_recursive (fp->_lock);
+ #endif
+ }
+ 
  int
  _DEFUN(_fclose_r, (rptr, fp),
        struct _reent *rptr _AND
***************
*** 92,114 ****
    r = fflush (fp);
    if (fp->_close != NULL && (*fp->_close) (fp->_cookie) < 0)
      r = EOF;
!   if (fp->_flags & __SMBF)
!     _free_r (rptr, (char *) fp->_bf._base);
!   if (HASUB (fp))
!     FREEUB (fp);
!   if (HASLB (fp))
!     FREELB (fp);
!   fp->_flags = 0;             /* release this FILE for reuse */
!   _funlockfile (fp);
! #ifndef __SINGLE_THREAD__
!   __lock_close_recursive (fp->_lock);
! #endif
  
    __sfp_lock_release ();
  
    return (r);
  }
  
  #ifndef _REENT_ONLY
  
  int
--- 112,145 ----
    r = fflush (fp);
    if (fp->_close != NULL && (*fp->_close) (fp->_cookie) < 0)
      r = EOF;
!   _do_reclaim_fp(rptr, fp, 1);
  
    __sfp_lock_release ();
  
    return (r);
  }
  
+ int
+ _DEFUN(__reclaim_fp, (fp),
+       register FILE * fp)
+ {
+   /* must not lock anything; thread might be 
+    * halfway torn-down already.
+    * ASSUME: 1) fp is part of thread-local reent; hence no need to __sfp_lock_acquire()
+    *         2) no other thread is using fp anymore hence it is OK not to lock
+    *         3) CHECK_INIT is not needed since the cleanup is only invoked
+    *            if __sdidinit
+    *
+    * PS: it really doesn't make much sense to use internal locking on a FILE
+    *     that is thread-local (stdin/stdout/stderr). Too bad we don't have
+    *     an option...
+    */
+   if ( fp )
+       _do_reclaim_fp( _REENT, fp, 0 /* we didn't lock fp */);
+ 
+   return (0);
+ }
+ 
  #ifndef _REENT_ONLY
  
  int
*** newlib-1.15.0/newlib/libc/stdio/findfp.c.cleanstdio.diff.orig       2007-06-20 17:21:24.000000000 -0700
--- newlib-1.15.0/newlib/libc/stdio/findfp.c    2007-06-20 17:22:52.000000000 -0700
***************
*** 160,167 ****
--- 160,176 ----
  _DEFUN(_cleanup_r, (ptr),
         struct _reent *ptr)
  {
+ #ifndef _STDIO_CLEANUP_NO_IO_SYSCALLS
    _CAST_VOID _fwalk(ptr, fclose);
    /* _CAST_VOID _fwalk (ptr, fflush); */      /* `cheating' */
+ #else
+   /* reclaim memory associated with FILEs attached to this
+    * reent without performing any I/O operations (no fflush,
+    * no close). E.g., RTEMS calls __reclaim_reent during thread
+    * deletion when it is no longer safe to do I/O.
+    */
+   _CAST_VOID _fwalk(ptr, __reclaim_fp);
+ #endif
  }
  
  #ifndef _REENT_ONLY
*** newlib-1.15.0/newlib/libc/stdio/local.h.cleanstdio.diff.orig        2006-09-26 14:22:19.000000000 -0700
--- newlib-1.15.0/newlib/libc/stdio/local.h     2007-06-20 17:22:52.000000000 -0700
***************
*** 46,51 ****
--- 46,53 ----
  extern int    _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
  struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
  
+ extern int    _EXFUN(__reclaim_fp,(FILE *));
+ 
  /* Called by the main entry point fns to ensure stdio has been initialized.  */
  
  #ifdef _REENT_SMALL