aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-08-24 03:21:51 +0000
committerRoland McGrath <roland@gnu.org>2001-08-24 03:21:51 +0000
commit0dce3d154c4af198a042bd2d1fd9241e6890a9b2 (patch)
tree5f8f58b370b2a254ba44f49bf42c6896663a1c54 /stdio-common
parent28cb9295720d06156b7c6b577086b199a47902d3 (diff)
downloadglibc-0dce3d154c4af198a042bd2d1fd9241e6890a9b2.zip
glibc-0dce3d154c4af198a042bd2d1fd9241e6890a9b2.tar.gz
glibc-0dce3d154c4af198a042bd2d1fd9241e6890a9b2.tar.bz2
* sysdeps/mach/hurd/bits/libc-lock.h: New file, initially copied from
sysdeps/mach version. Implement counting ("recursive") mutexes on top of cthreads mutexes. * sysdeps/mach/hurd/bits/stdio-lock.h: File removed; generic now works. * sysdeps/generic/bits/stdio-lock.h (_IO_lock_initializer): Define to _LIBC_LOCK_RECURSIVE_INITIALIZER if defined, else do an #error. (__libc_cleanup_region_start, __libc_cleanup_region_end, __libc_clean_end): Define these to call the cleanup function after normal exit when they're supposed to. * sysdeps/mach/bits/libc-lock.h (__libc_cleanup_region_start): Take new first arg DOIT, a boolean saying whether to really install any cleanup handler. (__libc_cleanup_region_end): Do nothing if start's DOIT arg was zero. (__libc_cleanup_end): Likewise. * stdio-common/vfscanf.c (LOCK_STREAM): Pass new arg. * stdio-common/vfprintf.c (buffered_vfprintf, vfprintf): Likewise. * sysdeps/mach/hurd/bits/stdio-lock.h (_IO_cleanup_region_start): Likewise. * misc/syslog.c (vsyslog, openlog, closelog): Likewise. * sysdeps/generic/bits/stdio-lock.h (_IO_cleanup_region_start, _IO_cleanup_region_start_noarg): Likewise.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/vfprintf.c6
-rw-r--r--stdio-common/vfscanf.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 68631fe..c5e78c7 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1296,10 +1296,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
/* Lock stream. */
#ifdef USE_IN_LIBIO
- __libc_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, s);
+ __libc_cleanup_region_start (1, (void (*) (void *)) &_IO_funlockfile, s);
_IO_flockfile (s);
#else
- __libc_cleanup_region_start ((void (*) (void *)) &__funlockfile, s);
+ __libc_cleanup_region_start (1, (void (*) (void *)) &__funlockfile, s);
__flockfile (s);
#endif
@@ -2086,7 +2086,7 @@ buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format,
result = vfprintf (hp, format, args);
/* Lock stream. */
- __libc_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, s);
+ __libc_cleanup_region_start (1, (void (*) (void *)) &_IO_funlockfile, s);
_IO_flockfile (s);
/* Now flush anything from the helper to the S. */
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 4dc9cfe..0b53d7e 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -168,7 +168,7 @@
} \
} while (0)
# define LOCK_STREAM(S) \
- __libc_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, (S)); \
+ __libc_cleanup_region_start (1, (void (*) (void *)) &_IO_funlockfile, (S)); \
_IO_flockfile (S)
# define UNLOCK_STREAM(S) \
_IO_funlockfile (S); \