diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/stdio-lock.h | 57 | ||||
| -rw-r--r-- | sysdeps/nptl/fork.c | 2 | ||||
| -rw-r--r-- | sysdeps/nptl/stdio-lock.h (renamed from sysdeps/nptl/bits/stdio-lock.h) | 6 | ||||
| -rw-r--r-- | sysdeps/pthread/flockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/ftrylockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/funlockfile.c | 2 |
6 files changed, 64 insertions, 7 deletions
diff --git a/sysdeps/generic/stdio-lock.h b/sysdeps/generic/stdio-lock.h new file mode 100644 index 0000000000..620e207f80 --- /dev/null +++ b/sysdeps/generic/stdio-lock.h @@ -0,0 +1,57 @@ +/* Thread package specific definitions of stream lock type. Generic version. + Copyright (C) 2000-2015 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _STDIO_LOCK_H +#define _STDIO_LOCK_H 1 + +#include <bits/libc-lock.h> + +__libc_lock_define_recursive (typedef, _IO_lock_t) + +/* We need recursive (counting) mutexes. */ +#ifdef _LIBC_LOCK_RECURSIVE_INITIALIZER +# define _IO_lock_initializer _LIBC_LOCK_RECURSIVE_INITIALIZER +#elif _IO_MTSAFE_IO + #error libio needs recursive mutexes for _IO_MTSAFE_IO +#endif + +#define _IO_lock_init(_name) __libc_lock_init_recursive (_name) +#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name) +#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name) +#define _IO_lock_trylock(_name) __libc_lock_trylock_recursive (_name) +#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name) + + +#define _IO_cleanup_region_start(_fct, _fp) \ + __libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp) +#define _IO_cleanup_region_start_noarg(_fct) \ + __libc_cleanup_region_start (1, _fct, NULL) +#define _IO_cleanup_region_end(_doit) \ + __libc_cleanup_region_end (_doit) + +#if defined _LIBC && IS_IN (libc) +# define _IO_acquire_lock(_fp) \ + _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ + _IO_flockfile (_fp) + +# define _IO_release_lock(_fp) \ + _IO_funlockfile (_fp); \ + _IO_cleanup_region_end (0) +#endif + +#endif /* stdio-lock.h */ diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c index 2b9ae4b571..1e251bd2d4 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c @@ -25,7 +25,7 @@ #include <tls.h> #include <hp-timing.h> #include <ldsodefs.h> -#include <bits/stdio-lock.h> +#include <stdio-lock.h> #include <atomic.h> #include <nptl/pthreadP.h> #include <fork.h> diff --git a/sysdeps/nptl/bits/stdio-lock.h b/sysdeps/nptl/stdio-lock.h index 8adf0319c4..9406eaa045 100644 --- a/sysdeps/nptl/bits/stdio-lock.h +++ b/sysdeps/nptl/stdio-lock.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_STDIO_LOCK_H -#define _BITS_STDIO_LOCK_H 1 +#ifndef _STDIO_LOCK_H +#define _STDIO_LOCK_H 1 #include <bits/libc-lock.h> #include <lowlevellock.h> @@ -107,4 +107,4 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t; #endif -#endif /* bits/stdio-lock.h */ +#endif /* stdio-lock.h */ diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c index c5c1ed8754..3894656747 100644 --- a/sysdeps/pthread/flockfile.c +++ b/sysdeps/pthread/flockfile.c @@ -19,7 +19,7 @@ #include <pthread.h> #include <stdio.h> #include <libio.h> -#include <bits/stdio-lock.h> +#include <stdio-lock.h> void diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c index 14dc764028..9ee0839882 100644 --- a/sysdeps/pthread/ftrylockfile.c +++ b/sysdeps/pthread/ftrylockfile.c @@ -19,7 +19,7 @@ #include <errno.h> #include <pthread.h> #include <stdio.h> -#include <bits/stdio-lock.h> +#include <stdio-lock.h> int diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c index 59172c3bb8..d33f7b0a56 100644 --- a/sysdeps/pthread/funlockfile.c +++ b/sysdeps/pthread/funlockfile.c @@ -19,7 +19,7 @@ #include <pthread.h> #include <stdio.h> #include <libio.h> -#include <bits/stdio-lock.h> +#include <stdio-lock.h> void |