Andreas Schwab
c2c4c80482
- Update to glibc 2.28
* The localization data for ISO 14651 is updated to match the 2016
Edition 4 release of the standard, this matches data provided by
Unicode 9.0.0
* Unicode 11.0.0 Support: Character encoding, character type info, and
transliteration tables are all updated to Unicode 11.0.0, using
generator scripts contributed by Mike FABIAN (Red Hat)
* <math.h> functions that round their results to a narrower type are added
from TS 18661-1:2014 and TS 18661-3:2015
* Two grammatical forms of month names are now supported
* The renameat2 function has been added, a variant of the renameat function
which has a flags argument
* The statx function has been added, a variant of the fstatat64
function with an additional flags argument
* IDN domain names in getaddrinfo and getnameinfo now use the system libidn2
library if installed
* Parsing of dynamic string tokens in DT_RPATH, DT_RUNPATH, DT_NEEDED,
DT_AUXILIARY, and DT_FILTER has been expanded to support the full
range of ELF gABI expressions including such constructs as
'$ORIGIN$ORIGIN' (if valid)
* Support for ISO C threads (ISO/IEC 9899:2011) has been added.
* The nonstandard header files <libio.h> and <_G_config.h> are no longer
installed
* The stdio functions 'getc' and 'putc' are no longer defined as macros
* All stdio functions now treat end-of-file as a sticky condition
* The macros 'major', 'minor', and 'makedev' are now only available from
the header <sys/sysmacros.h>
* The obsolete function ustat is no longer available to newly linked
binaries; the headers <ustat.h> and <sys/ustat.h> have been removed
* The obsolete function nfsservctl is no longer available to newly linked
OBS-URL: https://build.opensuse.org/request/show/627715
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=509
162 lines
4.8 KiB
Diff
162 lines
4.8 KiB
Diff
Always do locking when accessing streams (bug 15142)
|
|
|
|
During exit, skip files that are currently locked to avoid deadlock.
|
|
|
|
[BZ #15142]
|
|
* libio/libio.h (_IO_ftrylockfile) [_IO_MTSAVE_IO]: Define.
|
|
* libio/genops.c (_IO_flush_all_lockp): Make static. Rename
|
|
argument to skip_locked, callers changed. Skip files that are
|
|
locked if skip_locked.
|
|
(_IO_unbuffer_all): Lock files before access, but skip locked
|
|
files.
|
|
* libio/libioP.h (_IO_flush_all_lockp): Don't declare.
|
|
|
|
Index: glibc-2.27/libio/libio.h
|
|
===================================================================
|
|
--- glibc-2.27.orig/libio/libio.h
|
|
+++ glibc-2.27/libio/libio.h
|
|
@@ -33,11 +33,15 @@ libc_hidden_proto (_IO_vfscanf)
|
|
if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_lock (*(_fp)->_lock)
|
|
# define _IO_funlockfile(_fp) \
|
|
if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_unlock (*(_fp)->_lock)
|
|
+# define _IO_ftrylockfile(_fp) \
|
|
+ (((_fp)->_flags & _IO_USER_LOCK) == 0 ? _IO_lock_trylock (*(_fp)->_lock) : 0)
|
|
# else
|
|
# define _IO_flockfile(_fp) \
|
|
if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
|
|
# define _IO_funlockfile(_fp) \
|
|
if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
|
|
+# define _IO_ftrylockfile(_fp) \
|
|
+ (((_fp)->_flags & _IO_USER_LOCK) == 0 ? _IO_ftrylockfile (_fp) : 0)
|
|
# endif
|
|
#endif /* _IO_MTSAFE_IO */
|
|
|
|
Index: glibc-2.27/libio/genops.c
|
|
===================================================================
|
|
--- glibc-2.27.orig/libio/genops.c
|
|
+++ glibc-2.27/libio/genops.c
|
|
@@ -744,8 +744,8 @@ _IO_adjust_column (unsigned start, const
|
|
}
|
|
libc_hidden_def (_IO_adjust_column)
|
|
|
|
-int
|
|
-_IO_flush_all_lockp (int do_lock)
|
|
+static int
|
|
+_IO_flush_all_lockp (bool skip_locked)
|
|
{
|
|
int result = 0;
|
|
FILE *fp;
|
|
@@ -758,7 +758,16 @@ _IO_flush_all_lockp (int do_lock)
|
|
for (fp = (FILE *) _IO_list_all; fp != NULL; fp = fp->_chain)
|
|
{
|
|
run_fp = fp;
|
|
- if (do_lock)
|
|
+ if (skip_locked)
|
|
+ {
|
|
+ /* Skip files that are currently locked. */
|
|
+ if (_IO_ftrylockfile (fp))
|
|
+ {
|
|
+ run_fp = NULL;
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ else
|
|
_IO_flockfile (fp);
|
|
|
|
if (((fp->_mode <= 0 && fp->_IO_write_ptr > fp->_IO_write_base)
|
|
@@ -769,8 +778,7 @@ _IO_flush_all_lockp (int do_lock)
|
|
&& _IO_OVERFLOW (fp, EOF) == EOF)
|
|
result = EOF;
|
|
|
|
- if (do_lock)
|
|
- _IO_funlockfile (fp);
|
|
+ _IO_funlockfile (fp);
|
|
run_fp = NULL;
|
|
}
|
|
|
|
@@ -787,7 +795,7 @@ int
|
|
_IO_flush_all (void)
|
|
{
|
|
/* We want locking. */
|
|
- return _IO_flush_all_lockp (1);
|
|
+ return _IO_flush_all_lockp (false);
|
|
}
|
|
libc_hidden_def (_IO_flush_all)
|
|
|
|
@@ -852,22 +860,18 @@ _IO_unbuffer_all (void)
|
|
|
|
for (fp = (FILE *) _IO_list_all; fp; fp = fp->_chain)
|
|
{
|
|
+ run_fp = fp;
|
|
+ /* Skip files that are currently locked. */
|
|
+ if (_IO_ftrylockfile (fp))
|
|
+ {
|
|
+ run_fp = NULL;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
if (! (fp->_flags & _IO_UNBUFFERED)
|
|
/* Iff stream is un-orientated, it wasn't used. */
|
|
&& fp->_mode != 0)
|
|
{
|
|
-#ifdef _IO_MTSAFE_IO
|
|
- int cnt;
|
|
-#define MAXTRIES 2
|
|
- for (cnt = 0; cnt < MAXTRIES; ++cnt)
|
|
- if (fp->_lock == NULL || _IO_lock_trylock (*fp->_lock) == 0)
|
|
- break;
|
|
- else
|
|
- /* Give the other thread time to finish up its use of the
|
|
- stream. */
|
|
- __sched_yield ();
|
|
-#endif
|
|
-
|
|
if (! dealloc_buffers && !(fp->_flags & _IO_USER_BUF))
|
|
{
|
|
fp->_flags |= _IO_USER_BUF;
|
|
@@ -881,16 +885,14 @@ _IO_unbuffer_all (void)
|
|
|
|
if (fp->_mode > 0)
|
|
_IO_wsetb (fp, NULL, NULL, 0);
|
|
-
|
|
-#ifdef _IO_MTSAFE_IO
|
|
- if (cnt < MAXTRIES && fp->_lock != NULL)
|
|
- _IO_lock_unlock (*fp->_lock);
|
|
-#endif
|
|
}
|
|
|
|
/* Make sure that never again the wide char functions can be
|
|
used. */
|
|
fp->_mode = -1;
|
|
+
|
|
+ _IO_funlockfile (fp);
|
|
+ run_fp = NULL;
|
|
}
|
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
@@ -916,9 +918,9 @@ libc_freeres_fn (buffer_free)
|
|
int
|
|
_IO_cleanup (void)
|
|
{
|
|
- /* We do *not* want locking. Some threads might use streams but
|
|
- that is their problem, we flush them underneath them. */
|
|
- int result = _IO_flush_all_lockp (0);
|
|
+ /* We want to skip locked streams. Some threads might use streams but
|
|
+ that is their problem, we don't flush those. */
|
|
+ int result = _IO_flush_all_lockp (true);
|
|
|
|
/* We currently don't have a reliable mechanism for making sure that
|
|
C++ static destructors are executed in the correct order.
|
|
Index: glibc-2.27/libio/libioP.h
|
|
===================================================================
|
|
--- glibc-2.27.orig/libio/libioP.h
|
|
+++ glibc-2.27/libio/libioP.h
|
|
@@ -486,7 +486,6 @@ extern int _IO_new_do_write (FILE *, con
|
|
extern int _IO_old_do_write (FILE *, const char *, size_t);
|
|
extern int _IO_wdo_write (FILE *, const wchar_t *, size_t);
|
|
libc_hidden_proto (_IO_wdo_write)
|
|
-extern int _IO_flush_all_lockp (int);
|
|
extern int _IO_flush_all (void);
|
|
libc_hidden_proto (_IO_flush_all)
|
|
extern int _IO_cleanup (void);
|