mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
188 lines
6.7 KiB
C++
188 lines
6.7 KiB
C++
/* libc-internal interface for mutex locks. NPTL version.
|
|
Copyright (C) 1996-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; see the file COPYING.LIB. If
|
|
not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _LIBC_LOCK_H
|
|
#define _LIBC_LOCK_H 1
|
|
|
|
#include <pthread.h>
|
|
#define __need_NULL
|
|
#include <stddef.h>
|
|
|
|
|
|
/* Mutex type. */
|
|
#if defined _LIBC || defined _IO_MTSAFE_IO
|
|
# if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC
|
|
typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
|
|
# else
|
|
typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t;
|
|
# endif
|
|
#else
|
|
typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
|
|
#endif
|
|
|
|
/* Define a lock variable NAME with storage class CLASS. The lock must be
|
|
initialized with __libc_lock_init before it can be used (or define it
|
|
with __libc_lock_define_initialized, below). Use `extern' for CLASS to
|
|
declare a lock defined in another module. In public structure
|
|
definitions you must use a pointer to the lock structure (i.e., NAME
|
|
begins with a `*'), because its storage size will not be known outside
|
|
of libc. */
|
|
#define __libc_lock_define_recursive(CLASS,NAME) \
|
|
CLASS __libc_lock_recursive_t NAME;
|
|
|
|
/* Define an initialized recursive lock variable NAME with storage
|
|
class CLASS. */
|
|
#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
|
|
# define __libc_lock_define_initialized_recursive(CLASS, NAME) \
|
|
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
|
|
# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
|
|
{ LLL_LOCK_INITIALIZER, 0, NULL }
|
|
#else
|
|
# define __libc_lock_define_initialized_recursive(CLASS,NAME) \
|
|
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
|
|
# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
|
|
{PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}
|
|
#endif
|
|
|
|
/* Initialize a recursive mutex. */
|
|
#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
|
|
# define __libc_lock_init_recursive(NAME) \
|
|
((void) ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER))
|
|
#else
|
|
# define __libc_lock_init_recursive(NAME) \
|
|
do { \
|
|
if (__pthread_mutex_init != NULL) \
|
|
{ \
|
|
pthread_mutexattr_t __attr; \
|
|
__pthread_mutexattr_init (&__attr); \
|
|
__pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
|
|
__pthread_mutex_init (&(NAME).mutex, &__attr); \
|
|
__pthread_mutexattr_destroy (&__attr); \
|
|
} \
|
|
} while (0)
|
|
#endif
|
|
|
|
/* Finalize recursive named lock. */
|
|
#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
|
|
# define __libc_lock_fini_recursive(NAME) ((void) 0)
|
|
#else
|
|
# define __libc_lock_fini_recursive(NAME) \
|
|
__libc_maybe_call (__pthread_mutex_destroy, (&(NAME).mutex), 0)
|
|
#endif
|
|
|
|
/* Lock the recursive named lock variable. */
|
|
#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
|
|
# define __libc_lock_lock_recursive(NAME) \
|
|
do { \
|
|
void *self = THREAD_SELF; \
|
|
if ((NAME).owner != self) \
|
|
{ \
|
|
lll_lock ((NAME).lock, LLL_PRIVATE); \
|
|
(NAME).owner = self; \
|
|
} \
|
|
++(NAME).cnt; \
|
|
} while (0)
|
|
#else
|
|
# define __libc_lock_lock_recursive(NAME) \
|
|
__libc_maybe_call (__pthread_mutex_lock, (&(NAME).mutex), 0)
|
|
#endif
|
|
|
|
/* Try to lock the recursive named lock variable. */
|
|
#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
|
|
# define __libc_lock_trylock_recursive(NAME) \
|
|
({ \
|
|
int result = 0; \
|
|
void *self = THREAD_SELF; \
|
|
if ((NAME).owner != self) \
|
|
{ \
|
|
if (lll_trylock ((NAME).lock) == 0) \
|
|
{ \
|
|
(NAME).owner = self; \
|
|
(NAME).cnt = 1; \
|
|
} \
|
|
else \
|
|
result = EBUSY; \
|
|
} \
|
|
else \
|
|
++(NAME).cnt; \
|
|
result; \
|
|
})
|
|
#else
|
|
# define __libc_lock_trylock_recursive(NAME) \
|
|
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
|
|
#endif
|
|
|
|
/* Unlock the recursive named lock variable. */
|
|
#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
|
|
/* We do no error checking here. */
|
|
# define __libc_lock_unlock_recursive(NAME) \
|
|
do { \
|
|
if (--(NAME).cnt == 0) \
|
|
{ \
|
|
(NAME).owner = NULL; \
|
|
lll_unlock ((NAME).lock, LLL_PRIVATE); \
|
|
} \
|
|
} while (0)
|
|
#else
|
|
# define __libc_lock_unlock_recursive(NAME) \
|
|
__libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0)
|
|
#endif
|
|
|
|
/* Note that for I/O cleanup handling we are using the old-style
|
|
cancel handling. It does not have to be integrated with C++ since
|
|
no C++ code is called in the middle. The old-style handling is
|
|
faster and the support is not going away. */
|
|
extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
|
|
void (*routine) (void *), void *arg);
|
|
extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
|
|
int execute);
|
|
|
|
/* Start critical region with cleanup. */
|
|
#define __libc_cleanup_region_start(DOIT, FCT, ARG) \
|
|
{ struct _pthread_cleanup_buffer _buffer; \
|
|
int _avail; \
|
|
if (DOIT) { \
|
|
_avail = PTFAVAIL (_pthread_cleanup_push_defer); \
|
|
if (_avail) { \
|
|
__libc_ptf_call_always (_pthread_cleanup_push_defer, (&_buffer, FCT, \
|
|
ARG)); \
|
|
} else { \
|
|
_buffer.__routine = (FCT); \
|
|
_buffer.__arg = (ARG); \
|
|
} \
|
|
} else { \
|
|
_avail = 0; \
|
|
}
|
|
|
|
/* End critical region with cleanup. */
|
|
#define __libc_cleanup_region_end(DOIT) \
|
|
if (_avail) { \
|
|
__libc_ptf_call_always (_pthread_cleanup_pop_restore, (&_buffer, DOIT));\
|
|
} else if (DOIT) \
|
|
_buffer.__routine (_buffer.__arg); \
|
|
}
|
|
|
|
|
|
/* Hide the definitions which are only supposed to be used inside libc in
|
|
a separate file. This file is not present in the installation! */
|
|
#ifdef _LIBC
|
|
# include "libc-lockP.h"
|
|
#endif
|
|
|
|
#endif /* libc-lock.h */
|