summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--bits/stdio-lock.h4
-rw-r--r--libio/genops.c104
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/sysdeps/pthread/bits/stdio-lock.h8
-rw-r--r--sysdeps/generic/bits/stdio-lock.h4
-rw-r--r--sysdeps/mach/hurd/bits/stdio-lock.h4
7 files changed, 124 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 227145720d..baf87e71ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2001-07-23 Ulrich Drepper <drepper@redhat.com>
+ * libio/genops.c (_IO_list_all_stamp): New variable.
+ (_IO_un_link): Bump _IO_list_all_stamp after removing from list.
+ (_IO_link): Likewise for insertion.
+ (flush_cleanup): New function.
+ (_IO_flush_all): Get list_all_lock and all individual locks for the
+ streams. Detect and handle changes to the _IO_list_all list.
+ (_IO_flush_all_linebuffered): Likewise.
+ * sysdeps/generic/bits/stdio-lock.h: Define
+ _IO_cleanup_region_start_noarg.
+ * sysdeps/mach/hurd/bits/stdio-lock.c: Likewise.
+
* stdio-common/printf.h: Fix typo in comment.
* iconv/gconv_cache.c (__gconv_lookup_cache): Handle encoding from
diff --git a/bits/stdio-lock.h b/bits/stdio-lock.h
index 5e9f8196ac..225ccd8ff7 100644
--- a/bits/stdio-lock.h
+++ b/bits/stdio-lock.h
@@ -1,5 +1,5 @@
/* Thread package specific definitions of stream lock type. Stub version.
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -31,6 +31,8 @@ __libc_lock_define (typedef, _IO_lock_t)
#define _IO_cleanup_region_start(_fct, _fp) \
__libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+ __libc_cleanup_region_start (_fct, NULL)
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
#define _IO_lock_init(_name) \
diff --git a/libio/genops.c b/libio/genops.c
index fbe72db1cc..b878b63ef4 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1997-1999,2000,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -37,6 +37,9 @@
static _IO_lock_t list_all_lock = _IO_lock_initializer;
#endif
+/* Used to signal modifications to the list of FILE decriptors. */
+static int _IO_list_all_stamp;
+
void
_IO_un_link (fp)
struct _IO_FILE_plus *fp;
@@ -52,6 +55,7 @@ _IO_un_link (fp)
if (*f == fp)
{
*f = (struct _IO_FILE_plus *) fp->file._chain;
+ ++_IO_list_all_stamp;
break;
}
}
@@ -74,6 +78,7 @@ _IO_link_in (fp)
#endif
fp->file._chain = (_IO_FILE *) _IO_list_all;
_IO_list_all = fp;
+ ++_IO_list_all_stamp;
#ifdef _IO_MTSAFE_IO
_IO_lock_unlock (list_all_lock);
#endif
@@ -750,21 +755,65 @@ _IO_get_column (fp)
}
#endif
+
+static _IO_FILE *run_fp;
+
+static void
+flush_cleanup (void *not_used)
+{
+ if (run_fp != NULL)
+ _IO_funlockfile (run_fp);
+ _IO_lock_unlock (list_all_lock);
+}
+
+
int
_IO_flush_all ()
{
int result = 0;
struct _IO_FILE *fp;
- for (fp = (_IO_FILE *) _IO_list_all; fp; fp = fp->_chain)
- if (((fp->_mode <= 0 && fp->_IO_write_ptr > fp->_IO_write_base)
+ int last_stamp;
+
+#ifdef _IO_MTSAFE_IO
+ _IO_cleanup_region_start_noarg (flush_cleanup);
+ _IO_lock_lock (list_all_lock);
+#endif
+
+ last_stamp = _IO_list_all_stamp;
+ fp = (_IO_FILE *) _IO_list_all;
+ while (fp != NULL)
+ {
+ run_fp = fp;
+ _IO_flockfile (fp);
+
+ if (((fp->_mode <= 0 && fp->_IO_write_ptr > fp->_IO_write_base)
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
- || (fp->_vtable_offset == 0
- && fp->_mode > 0 && (fp->_wide_data->_IO_write_ptr
- > fp->_wide_data->_IO_write_base))
+ || (fp->_vtable_offset == 0
+ && fp->_mode > 0 && (fp->_wide_data->_IO_write_ptr
+ > fp->_wide_data->_IO_write_base))
+#endif
+ )
+ && _IO_OVERFLOW (fp, EOF) == EOF)
+ result = EOF;
+
+ _IO_funlockfile (fp);
+ run_fp = NULL;
+
+ if (last_stamp != _IO_list_all_stamp)
+ {
+ /* Something was added to the list. Start all over again. */
+ fp = (_IO_FILE *) _IO_list_all;
+ last_stamp = _IO_list_all_stamp;
+ }
+ else
+ fp = fp->_chain;
+ }
+
+#ifdef _IO_MTSAFE_IO
+ _IO_lock_unlock (list_all_lock);
+ _IO_cleanup_region_end (0);
#endif
- )
- && _IO_OVERFLOW (fp, EOF) == EOF)
- result = EOF;
+
return result;
}
@@ -772,9 +821,40 @@ void
_IO_flush_all_linebuffered ()
{
struct _IO_FILE *fp;
- for (fp = (_IO_FILE *) _IO_list_all; fp; fp = fp->_chain)
- if ((fp->_flags & _IO_NO_WRITES) == 0 && fp->_flags & _IO_LINE_BUF)
- _IO_OVERFLOW (fp, EOF);
+ int last_stamp;
+
+#ifdef _IO_MTSAFE_IO
+ _IO_cleanup_region_start_noarg (flush_cleanup);
+ _IO_lock_lock (list_all_lock);
+#endif
+
+ last_stamp = _IO_list_all_stamp;
+ fp = (_IO_FILE *) _IO_list_all;
+ while (fp != NULL)
+ {
+ run_fp = fp;
+ _IO_flockfile (fp);
+
+ if ((fp->_flags & _IO_NO_WRITES) == 0 && fp->_flags & _IO_LINE_BUF)
+ _IO_OVERFLOW (fp, EOF);
+
+ _IO_funlockfile (fp);
+ run_fp = NULL;
+
+ if (last_stamp != _IO_list_all_stamp)
+ {
+ /* Something was added to the list. Start all over again. */
+ fp = (_IO_FILE *) _IO_list_all;
+ last_stamp = _IO_list_all_stamp;
+ }
+ else
+ fp = fp->_chain;
+ }
+
+#ifdef _IO_MTSAFE_IO
+ _IO_lock_unlock (list_all_lock);
+ _IO_cleanup_region_end (0);
+#endif
}
#ifdef _LIBC
weak_alias (_IO_flush_all_linebuffered, _flushlbf)
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 257e90c78a..1e86a66bbb 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-23 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/pthread/bits/stdio-lock.h: Define
+ _IO_cleanup_region_start_noarg.
+
2001-07-23 Jakub Jelinek <jakub@redhat.com>
* sysdeps/alpha/pt-machine.h (FLOATING_STACKS): Define.
diff --git a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
index 42c219624f..a1893c8bd1 100644
--- a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
+++ b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
@@ -1,5 +1,5 @@
/* Thread package specific definitions of stream lock type.
- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -32,6 +32,12 @@ typedef pthread_mutex_t _IO_lock_t;
if (_avail) { \
_pthread_cleanup_push_defer (&_buffer, (_fct), (_fp)); \
}
+#define _IO_cleanup_region_start_noarg(_fct) \
+ { struct _pthread_cleanup_buffer _buffer; \
+ int _avail = _pthread_cleanup_push_defer != NULL; \
+ if (_avail) { \
+ _pthread_cleanup_push_defer (&_buffer, (_fct), NULL); \
+ }
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
#define _IO_lock_init(_name) \
diff --git a/sysdeps/generic/bits/stdio-lock.h b/sysdeps/generic/bits/stdio-lock.h
index 5e9f8196ac..225ccd8ff7 100644
--- a/sysdeps/generic/bits/stdio-lock.h
+++ b/sysdeps/generic/bits/stdio-lock.h
@@ -1,5 +1,5 @@
/* Thread package specific definitions of stream lock type. Stub version.
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -31,6 +31,8 @@ __libc_lock_define (typedef, _IO_lock_t)
#define _IO_cleanup_region_start(_fct, _fp) \
__libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+ __libc_cleanup_region_start (_fct, NULL)
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
#define _IO_lock_init(_name) \
diff --git a/sysdeps/mach/hurd/bits/stdio-lock.h b/sysdeps/mach/hurd/bits/stdio-lock.h
index 85f6d05643..e2b39578a9 100644
--- a/sysdeps/mach/hurd/bits/stdio-lock.h
+++ b/sysdeps/mach/hurd/bits/stdio-lock.h
@@ -1,5 +1,5 @@
/* Thread package specific definitions of stream lock type. Hurd version.
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -55,6 +55,8 @@ typedef struct _IO_cthreads_lock _IO_lock_t;
#define _IO_cleanup_region_start(_fct, _fp) \
__libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+ __libc_cleanup_region_start (_fct, NULL)
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 17:24:43 +0000