diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 12:58:42 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 12:58:42 +0400 |
| commit | 4aa28d8ae279329f2b46c92e05b0bf457f07b9af (patch) | |
| tree | ff4d1723c92ad0f708643f70125baf16e2beaf49 /newlib/libc/stdio/freopen.c | |
| parent | 75b6133098753a31b722f94b86e95b11323735f0 (diff) | |
* libc/stdio/local.h (_newlib_flockfile_start): New macro to
secure stream related critical section against thread cancellation.
(_newlib_flockfile_exit): Ditto.
(_newlib_sfp_lock_end): Ditto.
(_newlib_sfp_lock_start): Ditto for the list of streams.
(_newlib_sfp_lock_exit): Ditto.
(_newlib_sfp_lock_end): Ditto.
Use aforementioned macros in place of _flockfile/_funlockfile
and __sfp_lock_acquire/__sfp_lock_release throughout the code.
* libc/stdio/fclose.c: Explicitely disable and re-enable thread
cancellation. Explain why.
* libc/stdio/freopen.c: Ditto.
* libc/stdio64/freopen64.c: Ditto.
Diffstat (limited to 'newlib/libc/stdio/freopen.c')
| -rw-r--r-- | newlib/libc/stdio/freopen.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c index 172006259..6483655bf 100644 --- a/newlib/libc/stdio/freopen.c +++ b/newlib/libc/stdio/freopen.c @@ -100,11 +100,20 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), CHECK_INIT (ptr, fp); + /* We can't use the _newlib_flockfile_XXX macros here due to the + interlocked locking with the sfp_lock. */ +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + int __oldcancel; + pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &__oldcancel); +#endif _flockfile (fp); if ((flags = __sflags (ptr, mode, &oflags)) == 0) { _funlockfile (fp); +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + pthread_setcancelstate (__oldcancel, &__oldcancel); +#endif _fclose_r (ptr, fp); return NULL; } @@ -213,6 +222,9 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), __lock_close_recursive (fp->_lock); #endif __sfp_lock_release (); +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + pthread_setcancelstate (__oldcancel, &__oldcancel); +#endif return NULL; } @@ -230,6 +242,9 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), #endif _funlockfile (fp); +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + pthread_setcancelstate (__oldcancel, &__oldcancel); +#endif return fp; } |