From 0dce3d154c4af198a042bd2d1fd9241e6890a9b2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 24 Aug 2001 03:21:51 +0000 Subject: * 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. --- misc/syslog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'misc/syslog.c') diff --git a/misc/syslog.c b/misc/syslog.c index b89055b7b2..9553c296ea 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -216,7 +216,7 @@ vsyslog(pri, fmt, ap) /* Prepare for multiple users. We have to take care: open and write are cancellation points. */ - __libc_cleanup_region_start ((void (*) (void *)) cancel_handler, + __libc_cleanup_region_start (1, (void (*) (void *)) cancel_handler, &oldaction_ptr); __libc_lock_lock (syslog_lock); @@ -315,7 +315,8 @@ void openlog (const char *ident, int logstat, int logfac) { /* Protect against multiple users. */ - __libc_cleanup_region_start ((void (*) __P ((void *))) __libc_mutex_unlock, + __libc_cleanup_region_start (1, + (void (*) __P ((void *))) __libc_mutex_unlock, &syslog_lock); __libc_lock_lock (syslog_lock); @@ -346,7 +347,8 @@ void closelog () { /* Protect against multiple users. */ - __libc_cleanup_region_start ((void (*) __P ((void *))) __libc_mutex_unlock, + __libc_cleanup_region_start (1, + (void (*) __P ((void *))) __libc_mutex_unlock, &syslog_lock); __libc_lock_lock (syslog_lock); -- cgit v1.2.1