diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-01-28 10:49:11 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-01-28 10:49:11 +0000 |
| commit | 656df313e08a9ac4ef33c553285bb52d23c3e15f (patch) | |
| tree | 5288836d1861c764410741e9b300ce21c3627aba /newlib/libc/stdio/fread.c | |
| parent | b5ca0d72711a691b733e64a7ea8cb93ef1d8d98e (diff) | |
| download | cygnal-656df313e08a9ac4ef33c553285bb52d23c3e15f.tar.gz cygnal-656df313e08a9ac4ef33c553285bb52d23c3e15f.tar.bz2 cygnal-656df313e08a9ac4ef33c553285bb52d23c3e15f.zip | |
* 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/fread.c')
| -rw-r--r-- | newlib/libc/stdio/fread.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index dda2044fe..a39e9d85f 100644 --- a/newlib/libc/stdio/fread.c +++ b/newlib/libc/stdio/fread.c @@ -146,7 +146,6 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), CHECK_INIT(ptr, fp); - __sfp_lock_acquire (); _flockfile (fp); ORIENT (fp, -1); if (fp->_r < 0) @@ -197,12 +196,10 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), if (fp->_flags & __SCLE) { _funlockfile (fp); - __sfp_lock_release (); return crlf_r (ptr, fp, buf, total-resid, 1) / size; } #endif _funlockfile (fp); - __sfp_lock_release (); return (total - resid) / size; } } @@ -224,12 +221,10 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), if (fp->_flags & __SCLE) { _funlockfile (fp); - __sfp_lock_release (); return crlf_r (ptr, fp, buf, total-resid, 1) / size; } #endif _funlockfile (fp); - __sfp_lock_release (); return (total - resid) / size; } } @@ -243,12 +238,10 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), if (fp->_flags & __SCLE) { _funlockfile (fp); - __sfp_lock_release (); return crlf_r(ptr, fp, buf, total, 0) / size; } #endif _funlockfile (fp); - __sfp_lock_release (); return count; } |