From 4aa28d8ae279329f2b46c92e05b0bf457f07b9af Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 30 May 2012 08:58:42 +0000 Subject: * 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. --- newlib/libc/stdio/open_memstream.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'newlib/libc/stdio/open_memstream.c') diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c index a53bdef2f..0b58720a1 100644 --- a/newlib/libc/stdio/open_memstream.c +++ b/newlib/libc/stdio/open_memstream.c @@ -313,12 +313,12 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide), return NULL; if ((c = (memstream *) _malloc_r (ptr, sizeof *c)) == NULL) { - __sfp_lock_acquire (); + _newlib_sfp_lock_start (); fp->_flags = 0; /* release */ #ifndef __SINGLE_THREAD__ __lock_close_recursive (fp->_lock); #endif - __sfp_lock_release (); + _newlib_sfp_lock_end (); return NULL; } /* Use *size as a hint for initial sizing, but bound the initial @@ -338,12 +338,12 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide), *buf = _malloc_r (ptr, c->max); if (!*buf) { - __sfp_lock_acquire (); + _newlib_sfp_lock_start (); fp->_flags = 0; /* release */ #ifndef __SINGLE_THREAD__ __lock_close_recursive (fp->_lock); #endif - __sfp_lock_release (); + _newlib_sfp_lock_end (); _free_r (ptr, c); return NULL; } @@ -359,7 +359,7 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide), c->saved.w = L'\0'; c->wide = (int8_t) wide; - _flockfile (fp); + _newlib_flockfile_start (fp); fp->_file = -1; fp->_flags = __SWR; fp->_cookie = c; @@ -372,7 +372,7 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide), #endif fp->_close = memcloser; ORIENT (fp, wide); - _funlockfile (fp); + _newlib_flockfile_end (fp); return fp; } -- cgit v1.2.3