diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-01-28 13:49:11 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-01-28 13:49:11 +0300 |
| commit | 656df313e08a9ac4ef33c553285bb52d23c3e15f (patch) | |
| tree | 5288836d1861c764410741e9b300ce21c3627aba /newlib/libc/stdio/fclose.c | |
| parent | b5ca0d72711a691b733e64a7ea8cb93ef1d8d98e (diff) | |
* libc/stdio/fclose.c: Only use sfp lock to guard non-atomic
changes of flags and fp lock.
* libc/stdio/freopen.c: Ditto.
* libc/stdio/freopen64.c: Ditto.
* libc/stdio/fgetc.c: Revert change from 2009-04-24, remove sfp locks
which guard entire function to avoid potential deadlocks when using
stdio functions in multiple thraeds.
* libc/stdio/fgets.c: Ditto.
* libc/stdio/fgetwc.c: Ditto.
* libc/stdio/fgetws.c: Ditto.
* libc/stdio/fread.c: Ditto.
* libc/stdio/fseek.c: Ditto.
* libc/stdio/getc.c: Ditto.
* libc/stdio/getdelim.c: Ditto.
* libc/stdio/gets.c: Ditto.
* libc/stdio/vfscanf.c: Ditto.
* libc/stdio/vfwscanf.c: Ditto.
* libc/stdio/fflush.c (_fflush_r): Split out core functionality into
new function __sflush_r. Just lock file and call __sflush_r from here.
* libc/stdio/fwalk.c (_fwalk): Remove static helper function and move
functionality back into main function. Don't walk a file with flags
value of 1. Add comment.
(_fwalk_reent): Ditto.
* libc/stdio/local.h (__sflush_r): Declare.
* libc/stdio/refill.c (__srefill): Before calling fwalk, set flags
value to 1 so this file pointer isn't walked. Revert flags afterwards
and call __sflush_r for this fp if necessary. Add comments.
Diffstat (limited to 'newlib/libc/stdio/fclose.c')
| -rw-r--r-- | newlib/libc/stdio/fclose.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c index a14a63f3f..3c8868a51 100644 --- a/newlib/libc/stdio/fclose.c +++ b/newlib/libc/stdio/fclose.c @@ -74,8 +74,6 @@ _DEFUN(_fclose_r, (rptr, fp), if (fp == NULL) return (0); /* on NULL */ - __sfp_lock_acquire (); - CHECK_INIT (rptr, fp); _flockfile (fp); @@ -83,7 +81,6 @@ _DEFUN(_fclose_r, (rptr, fp), if (fp->_flags == 0) /* not open! */ { _funlockfile (fp); - __sfp_lock_release (); return (0); } /* Unconditionally flush to allow special handling for seekable read @@ -98,6 +95,7 @@ _DEFUN(_fclose_r, (rptr, fp), FREEUB (rptr, fp); if (HASLB (fp)) FREELB (rptr, fp); + __sfp_lock_acquire (); fp->_flags = 0; /* release this FILE for reuse */ _funlockfile (fp); #ifndef __SINGLE_THREAD__ |