From 656df313e08a9ac4ef33c553285bb52d23c3e15f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 28 Jan 2011 10:49:11 +0000 Subject: * 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. --- newlib/libc/stdio64/freopen64.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'newlib/libc/stdio64/freopen64.c') diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index 866d8c943..1e2ec7827 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -97,7 +97,6 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), int flags, oflags; int e = 0; - __sfp_lock_acquire (); CHECK_INIT (ptr, fp); @@ -107,7 +106,6 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), { _funlockfile(fp); _fclose_r (ptr, fp); - __sfp_lock_release (); return NULL; } @@ -204,6 +202,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), if (f < 0) { /* did not get it after all */ + __sfp_lock_acquire (); fp->_flags = 0; /* set it free */ ptr->_errno = e; /* restore in case _close clobbered */ _funlockfile(fp); @@ -231,7 +230,6 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), fp->_flags |= __SL64; _funlockfile(fp); - __sfp_lock_release (); return fp; } -- cgit v1.2.3