diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-11-09 14:26:25 -0500 | 
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-11-09 14:26:25 -0500 | 
| commit | dc059f03e8277abe3f515f350bd9615416aaa5ef (patch) | |
| tree | c9505ffffa3d8a211f7d3a0432986664409e2e24 | |
| parent | 65465101ee23447bf30adc3a9ebf817d58f5d956 (diff) | |
| download | musl-dc059f03e8277abe3f515f350bd9615416aaa5ef.tar.gz | |
always add memory streams to stdio open file list
per interpretation for austin group issue #626, fflush(0) and exit()
must block waiting for a lock if another thread has locked a memory
stream with flockfile. this adds some otherwise-unnecessary
synchronization cost to use of memory streams, but there was already a
synchronization cost calling malloc anyway.
previously the stream was only added to the open file list in
single-threaded programs, so that upon subsequent call to
pthread_create, locking could be turned on for the stream.
| -rw-r--r-- | src/stdio/fmemopen.c | 13 | ||||
| -rw-r--r-- | src/stdio/open_memstream.c | 13 | ||||
| -rw-r--r-- | src/stdio/open_wmemstream.c | 13 | 
3 files changed, 21 insertions, 18 deletions
diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c index 91d52bc1..d7849609 100644 --- a/src/stdio/fmemopen.c +++ b/src/stdio/fmemopen.c @@ -108,12 +108,13 @@ FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)  	f->seek = mseek;  	f->close = mclose; -	if (!libc.threaded) { -		f->lock = -1; -		f->next = libc.ofl_head; -		if (libc.ofl_head) libc.ofl_head->prev = f; -		libc.ofl_head = f; -	} +	if (!libc.threaded) f->lock = -1; + +	OFLLOCK(); +	f->next = libc.ofl_head; +	if (libc.ofl_head) libc.ofl_head->prev = f; +	libc.ofl_head = f; +	OFLUNLOCK();  	return f;  } diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c index c7330abe..9eafdfba 100644 --- a/src/stdio/open_memstream.c +++ b/src/stdio/open_memstream.c @@ -77,12 +77,13 @@ FILE *open_memstream(char **bufp, size_t *sizep)  	f->seek = ms_seek;  	f->close = ms_close; -	if (!libc.threaded) { -		f->lock = -1; -		f->next = libc.ofl_head; -		if (libc.ofl_head) libc.ofl_head->prev = f; -		libc.ofl_head = f; -	} +	if (!libc.threaded) f->lock = -1; + +	OFLLOCK(); +	f->next = libc.ofl_head; +	if (libc.ofl_head) libc.ofl_head->prev = f; +	libc.ofl_head = f; +	OFLUNLOCK();  	return f;  } diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c index 2fe504c7..35370309 100644 --- a/src/stdio/open_wmemstream.c +++ b/src/stdio/open_wmemstream.c @@ -79,12 +79,13 @@ FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)  	f->seek = wms_seek;  	f->close = wms_close; -	if (!libc.threaded) { -		f->lock = -1; -		f->next = libc.ofl_head; -		if (libc.ofl_head) libc.ofl_head->prev = f; -		libc.ofl_head = f; -	} +	if (!libc.threaded) f->lock = -1; + +	OFLLOCK(); +	f->next = libc.ofl_head; +	if (libc.ofl_head) libc.ofl_head->prev = f; +	libc.ofl_head = f; +	OFLUNLOCK();  	return f;  }  | 
