Andreas Schwab
5a64f33a11
- Update to glibc 2.30
* Unicode 12.1.0 Support
* The dynamic linker accepts the --preload argument to preload shared
objects
* The twalk_r function has been added
* On Linux, the getdents64, gettid, and tgkill functions have been added
* Minguo (Republic of China) calendar support has been added
* The entry for the new Japanese era has been added
* Memory allocation functions malloc, calloc, realloc, reallocarray, valloc,
pvalloc, memalign, and posix_memalign fail now with total object size
larger than PTRDIFF_MAX
* The dynamic linker no longer refuses to load objects which reference
versioned symbols whose implementation has moved to a different soname
since the object has been linked
* Add new POSIX-proposed pthread_cond_clockwait, pthread_mutex_clocklock,
pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock and sem_clockwait
functions
* On AArch64 the GNU IFUNC resolver call ABI changed
* The copy_file_range function fails with ENOSYS if the kernel does not
support the system call of the same name
* The functions clock_gettime, clock_getres, clock_settime,
clock_getcpuclockid, clock_nanosleep were removed from the librt library
for new applications (on architectures which had them)
* The obsolete and never-implemented XSI STREAMS header files <stropts.h>
and <sys/stropts.h> have been removed
* Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6
resolver flag (deprecated in glibc 2.25) have been removed
* The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub
resolver have been removed from <resolv.h>
* With --enable-bind-now, installed programs are now linked with the
OBS-URL: https://build.opensuse.org/request/show/720569
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=535
166 lines
4.9 KiB
Diff
166 lines
4.9 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,6 +860,14 @@ _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;
|
|
+ }
|
|
+
|
|
int legacy = 0;
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
|
|
@@ -863,18 +879,6 @@ _IO_unbuffer_all (void)
|
|
/* Iff stream is un-orientated, it wasn't used. */
|
|
&& (legacy || 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 (! legacy && ! dealloc_buffers && !(fp->_flags & _IO_USER_BUF))
|
|
{
|
|
fp->_flags |= _IO_USER_BUF;
|
|
@@ -881,17 +885,15 @@ _IO_unbuffer_all (void)
|
|
|
|
if (! legacy && 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. */
|
|
if (! legacy)
|
|
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);
|