diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/Makefile | 26 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/errno.h | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/cthreads.c | 10 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/libc-lock.h | 216 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setpgid.c | 10 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setsid.c | 10 | ||||
| -rw-r--r-- | sysdeps/mach/libc-lock.h | 142 |
7 files changed, 142 insertions, 278 deletions
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile index 2b48b13f61..475894b046 100644 --- a/sysdeps/mach/Makefile +++ b/sysdeps/mach/Makefile @@ -50,4 +50,30 @@ mach-before-compile: before-compile += $(mach-before-compile) endif +ifeq (crypt,$(subdir)) + LDLIBS-crypt.so += $(objdir)/mach/libmachuser.so +else ifeq (dlfcn,$(subdir)) + LDLIBS-dl.so += $(objdir)/mach/libmachuser.so +else ifeq (nis,$(subdir)) + LDLIBS-nsl.so += $(objdir)/mach/libmachuser.so + LDLIBS-nss_nis.so += $(objdir)/mach/libmachuser.so + LDLIBS-nss_nisplus.so += $(objdir)/mach/libmachuser.so + LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so +else ifeq (nss,$(subdir)) + LDLIBS-nss.so += $(objdir)/mach/libmachuser.so + LDLIBS-nss_files.so += $(objdir)/mach/libmachuser.so + LDLIBS-nss_db.so += $(objdir)/mach/libmachuser.so + LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so +else ifeq (hesiod,$(subdir)) + LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so +else ifeq (posix,$(subdir)) + LDLIBS-tst-rfc3484 += $(objdir)/mach/libmachuser.so + LDLIBS-tst-rfc3484-2 += $(objdir)/mach/libmachuser.so + LDLIBS-tst-rfc3484-3 += $(objdir)/mach/libmachuser.so +else ifeq (nscd,$(subdir)) + LDLIBS-nscd += $(objdir)/mach/libmachuser.so +endif + +LDLIBS-pthread.so += $(objdir)/mach/libmachuser.so + endif # in-Makerules diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h index f16cd51a63..999730721f 100644 --- a/sysdeps/mach/hurd/bits/errno.h +++ b/sysdeps/mach/hurd/bits/errno.h @@ -127,6 +127,8 @@ enum __error_t_codes EPROTO = 0x40000074, /* Protocol error */ ETIME = 0x40000075, /* Timer expired */ ECANCELED = 0x40000077, /* Operation canceled */ + EOWNERDEAD = 0x40000078, /* Robust mutex owner died */ + ENOTRECOVERABLE = 0x40000079, /* Robust mutex irrecoverable */ /* Errors from <mach/message.h>. */ EMACH_SEND_IN_PROGRESS = 0x10000001, @@ -322,6 +324,8 @@ enum __error_t_codes #define EPROTO 0x40000074 #define ETIME 0x40000075 #define ECANCELED 0x40000077 +#define EOWNERDEAD 0x40000078 +#define ENOTRECOVERABLE 0x40000079 /* Errors from <mach/message.h>. */ #define EMACH_SEND_IN_PROGRESS 0x10000001 @@ -405,6 +409,6 @@ enum __error_t_codes #define ED_NO_MEMORY 2508 #define ED_READ_ONLY 2509 -#define _HURD_ERRNOS 120 +#define _HURD_ERRNOS 122 #endif /* bits/errno.h. */ diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c index 585650522a..05c48e4e4c 100644 --- a/sysdeps/mach/hurd/cthreads.c +++ b/sysdeps/mach/hurd/cthreads.c @@ -52,13 +52,3 @@ __cthread_setspecific (cthread_key_t key, void *val) __set_errno (ENOSYS); return -1; } - -/* Call cthread_getspecific which gets a pointer to the return value instead - of just returning it. */ -void * -__libc_getspecific (cthread_key_t key) -{ - void *val; - __cthread_getspecific (key, &val); - return val; -} diff --git a/sysdeps/mach/hurd/libc-lock.h b/sysdeps/mach/hurd/libc-lock.h deleted file mode 100644 index f5a1f66a23..0000000000 --- a/sysdeps/mach/hurd/libc-lock.h +++ /dev/null @@ -1,216 +0,0 @@ -/* libc-internal interface for mutex locks. Hurd version using Mach cthreads. - Copyright (C) 1996-2018 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 _LIBC_LOCK_H -#define _LIBC_LOCK_H 1 - -#if (_LIBC - 0) || (_CTHREADS_ - 0) -#include <cthreads.h> - -/* The locking here is very inexpensive, even for inlining. */ -#define _IO_lock_inexpensive 1 - -typedef struct mutex __libc_lock_t; -typedef struct -{ - struct mutex mutex; - void *owner; - int count; -} __libc_lock_recursive_t; -typedef __libc_lock_recursive_t __rtld_lock_recursive_t; - -extern char __libc_lock_self0[0]; -#define __libc_lock_owner_self() (__LIBC_NO_TLS () ? &__libc_lock_self0 : THREAD_SELF) - -#else -typedef struct __libc_lock_opaque__ __libc_lock_t; -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(CLASS,NAME) \ - CLASS __libc_lock_t NAME; - -/* Define an initialized lock variable NAME with storage class CLASS. */ -#define _LIBC_LOCK_INITIALIZER MUTEX_INITIALIZER -#define __libc_lock_define_initialized(CLASS,NAME) \ - CLASS __libc_lock_t NAME = _LIBC_LOCK_INITIALIZER; - -/* Initialize the named lock variable, leaving it in a consistent, unlocked - state. */ -#define __libc_lock_init(NAME) __mutex_init (&(NAME)) - -/* Finalize the named lock variable, which must be locked. It cannot be - used again until __libc_lock_init is called again on it. This must be - called on a lock variable before the containing storage is reused. */ -#define __libc_lock_fini(NAME) __mutex_unlock (&(NAME)) -#define __libc_lock_fini_recursive(NAME) __mutex_unlock (&(NAME).mutex) -#define __rtld_lock_fini_recursive(NAME) __mutex_unlock (&(NAME).mutex) - - -/* Lock the named lock variable. */ -#define __libc_lock_lock(NAME) __mutex_lock (&(NAME)) - -/* Lock the named lock variable. */ -#define __libc_lock_trylock(NAME) (!__mutex_trylock (&(NAME))) - -/* Unlock the named lock variable. */ -#define __libc_lock_unlock(NAME) __mutex_unlock (&(NAME)) - - -#define __libc_lock_define_recursive(CLASS,NAME) \ - CLASS __libc_lock_recursive_t NAME; -#define _LIBC_LOCK_RECURSIVE_INITIALIZER { MUTEX_INITIALIZER, 0, 0 } -#define __libc_lock_define_initialized_recursive(CLASS,NAME) \ - CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; - -#define __rtld_lock_define_recursive(CLASS,NAME) \ - __libc_lock_define_recursive (CLASS, NAME) -#define _RTLD_LOCK_RECURSIVE_INITIALIZER \ - _LIBC_LOCK_RECURSIVE_INITIALIZER -#define __rtld_lock_define_initialized_recursive(CLASS,NAME) \ - __libc_lock_define_initialized_recursive (CLASS, NAME) - -#define __libc_lock_init_recursive(NAME) \ - ({ __libc_lock_recursive_t *const __lock = &(NAME); \ - __lock->owner = 0; mutex_init (&__lock->mutex); }) - -#define __libc_lock_trylock_recursive(NAME) \ - ({ __libc_lock_recursive_t *const __lock = &(NAME); \ - void *__self = __libc_lock_owner_self (); \ - __mutex_trylock (&__lock->mutex) \ - ? (__lock->owner = __self, __lock->count = 1, 0) \ - : __lock->owner == __self ? (++__lock->count, 0) : 1; }) - -#define __libc_lock_lock_recursive(NAME) \ - ({ __libc_lock_recursive_t *const __lock = &(NAME); \ - void *__self = __libc_lock_owner_self (); \ - if (__mutex_trylock (&__lock->mutex) \ - || (__lock->owner != __self \ - && (__mutex_lock (&__lock->mutex), 1))) \ - __lock->owner = __self, __lock->count = 1; \ - else \ - ++__lock->count; \ - }) -#define __libc_lock_unlock_recursive(NAME) \ - ({ __libc_lock_recursive_t *const __lock = &(NAME); \ - if (--__lock->count == 0) \ - { \ - __lock->owner = 0; \ - __mutex_unlock (&__lock->mutex); \ - } \ - }) - - -#define __rtld_lock_initialize(NAME) \ - (void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER) -#define __rtld_lock_trylock_recursive(NAME) \ - __libc_lock_trylock_recursive (NAME) -#define __rtld_lock_lock_recursive(NAME) \ - __libc_lock_lock_recursive(NAME) -#define __rtld_lock_unlock_recursive(NAME) \ - __libc_lock_unlock_recursive (NAME) - - -/* XXX for now */ -#define __libc_rwlock_define __libc_lock_define -#define __libc_rwlock_define_initialized __libc_lock_define_initialized -#define __libc_rwlock_init __libc_lock_init -#define __libc_rwlock_fini __libc_lock_fini -#define __libc_rwlock_rdlock __libc_lock_lock -#define __libc_rwlock_wrlock __libc_lock_lock -#define __libc_rwlock_tryrdlock __libc_lock_trylock -#define __libc_rwlock_trywrlock __libc_lock_trylock -#define __libc_rwlock_unlock __libc_lock_unlock - - -/* Start a critical region with a cleanup function */ -#define __libc_cleanup_region_start(DOIT, FCT, ARG) \ -{ \ - typeof (***(FCT)) *__save_FCT = (DOIT) ? (FCT) : 0; \ - typeof (ARG) __save_ARG = ARG; \ - /* close brace is in __libc_cleanup_region_end below. */ - -/* End a critical region started with __libc_cleanup_region_start. */ -#define __libc_cleanup_region_end(DOIT) \ - if ((DOIT) && __save_FCT != 0) \ - (*__save_FCT)(__save_ARG); \ -} - -/* Sometimes we have to exit the block in the middle. */ -#define __libc_cleanup_end(DOIT) \ - if ((DOIT) && __save_FCT != 0) \ - (*__save_FCT)(__save_ARG); \ - -#define __libc_cleanup_push(fct, arg) __libc_cleanup_region_start (1, fct, arg) -#define __libc_cleanup_pop(execute) __libc_cleanup_region_end (execute) - -#if (_CTHREADS_ - 0) - -/* Use mutexes as once control variables. */ - -struct __libc_once - { - __libc_lock_t lock; - int done; - }; - -#define __libc_once_define(CLASS,NAME) \ - CLASS struct __libc_once NAME = { MUTEX_INITIALIZER, 0 } - -/* Call handler iff the first call. */ -#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \ - do { \ - __libc_lock_lock (ONCE_CONTROL.lock); \ - if (!ONCE_CONTROL.done) \ - (INIT_FUNCTION) (); \ - ONCE_CONTROL.done = 1; \ - __libc_lock_unlock (ONCE_CONTROL.lock); \ - } while (0) - -/* Get once control variable. */ -#define __libc_once_get(ONCE_CONTROL) ((ONCE_CONTROL).done != 0) - -#ifdef _LIBC -/* We need portable names for some functions. E.g., when they are - used as argument to __libc_cleanup_region_start. */ -#define __libc_mutex_unlock __mutex_unlock -#endif - -/* Type for key of thread specific data. */ -typedef cthread_key_t __libc_key_t; - -#define __libc_key_create(KEY,DEST) __cthread_keycreate (KEY) -#define __libc_setspecific(KEY,VAL) __cthread_setspecific (KEY, VAL) -void *__libc_getspecific (__libc_key_t key); - -#endif /* _CTHREADS_ */ - -/* 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 */ diff --git a/sysdeps/mach/hurd/setpgid.c b/sysdeps/mach/hurd/setpgid.c index 32186a25de..98b1341cfa 100644 --- a/sysdeps/mach/hurd/setpgid.c +++ b/sysdeps/mach/hurd/setpgid.c @@ -19,6 +19,7 @@ #include <unistd.h> #include <hurd.h> #include <hurd/port.h> +#include <lowlevellock.h> /* Set the process group ID of the process matching PID to PGID. If PID is zero, the current process's process group ID is set. @@ -38,14 +39,7 @@ __setpgid (pid_t pid, pid_t pgid) /* Synchronize with the signal thread to make sure we have received and processed proc_newids before returning to the user. */ while (_hurd_pids_changed_stamp == stamp) - { -#ifdef noteven - /* XXX we have no need for a mutex, but cthreads demands one. */ - __condition_wait (&_hurd_pids_changed_sync, NULL); -#else - __swtch_pri(0); -#endif - } + lll_wait (&_hurd_pids_changed_stamp, stamp, 0); return 0; diff --git a/sysdeps/mach/hurd/setsid.c b/sysdeps/mach/hurd/setsid.c index 0f6b24b1d2..7b989361d1 100644 --- a/sysdeps/mach/hurd/setsid.c +++ b/sysdeps/mach/hurd/setsid.c @@ -21,6 +21,7 @@ #include <hurd/port.h> #include <hurd/fd.h> #include <hurd/ioctl.h> +#include <lowlevellock.h> /* Create a new session with the calling process as its leader. The process group IDs of the session and the calling process @@ -55,14 +56,7 @@ __setsid (void) returned by `getpgrp ()' in other threads) has been updated before we return. */ while (_hurd_pids_changed_stamp == stamp) - { -#ifdef noteven - /* XXX we have no need for a mutex, but cthreads demands one. */ - __condition_wait (&_hurd_pids_changed_sync, NULL); -#else - __swtch_pri (0); -#endif - } + lll_wait (&_hurd_pids_changed_stamp, stamp, 0); } HURD_CRITICAL_END; diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h index 1bb0235cf2..2c64019b33 100644 --- a/sysdeps/mach/libc-lock.h +++ b/sysdeps/mach/libc-lock.h @@ -20,15 +20,32 @@ #define _LIBC_LOCK_H 1 #ifdef _LIBC -#include <cthreads.h> -#define __libc_lock_t struct mutex + +#include <tls.h> +#include <lowlevellock.h> + +/* The locking here is very inexpensive, even for inlining. */ +#define _IO_lock_inexpensive 1 + +typedef unsigned int __libc_lock_t; +typedef struct +{ + __libc_lock_t lock; + int cnt; + void *owner; +} __libc_lock_recursive_t; + +typedef __libc_lock_recursive_t __rtld_lock_recursive_t; + +extern char __libc_lock_self0[0]; +#define __libc_lock_owner_self() \ + (__LIBC_NO_TLS () ? (void *)&__libc_lock_self0 : THREAD_SELF) + #else typedef struct __libc_lock_opaque__ __libc_lock_t; +typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif -/* Type for key of thread specific data. */ -typedef cthread_key_t __libc_key_t; - /* 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 @@ -40,27 +57,97 @@ typedef cthread_key_t __libc_key_t; CLASS __libc_lock_t NAME; /* Define an initialized lock variable NAME with storage class CLASS. */ +#define _LIBC_LOCK_INITIALIZER LLL_INITIALIZER #define __libc_lock_define_initialized(CLASS,NAME) \ - CLASS __libc_lock_t NAME = MUTEX_INITIALIZER; + CLASS __libc_lock_t NAME = LLL_INITIALIZER; /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ -#define __libc_lock_init(NAME) __mutex_init (&(NAME)) +#define __libc_lock_init(NAME) (NAME) = LLL_INITIALIZER /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be called on a lock variable before the containing storage is reused. */ -#define __libc_lock_fini(NAME) __mutex_unlock (&(NAME)) +#define __libc_lock_fini __libc_lock_unlock +#define __libc_lock_fini_recursive __libc_lock_unlock_recursive +#define __rtld_lock_fini_recursive __rtld_lock_unlock_recursive /* Lock the named lock variable. */ -#define __libc_lock_lock(NAME) __mutex_lock (&(NAME)) +#define __libc_lock_lock(NAME) \ + ({ lll_lock (&(NAME), 0); 0; }) /* Lock the named lock variable. */ -#define __libc_lock_trylock(NAME) (!__mutex_trylock (&(NAME))) +#define __libc_lock_trylock(NAME) lll_trylock (&(NAME)) /* Unlock the named lock variable. */ -#define __libc_lock_unlock(NAME) __mutex_unlock (&(NAME)) - +#define __libc_lock_unlock(NAME) \ + ({ lll_unlock (&(NAME), 0); 0; }) + +#define __libc_lock_define_recursive(CLASS,NAME) \ + CLASS __libc_lock_recursive_t NAME; + +#define _LIBC_LOCK_RECURSIVE_INITIALIZER { LLL_INITIALIZER, 0, 0 } + +#define __libc_lock_define_initialized_recursive(CLASS,NAME) \ + CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; + +#define __rtld_lock_define_recursive(CLASS,NAME) \ + __libc_lock_define_recursive (CLASS, NAME) +#define _RTLD_LOCK_RECURSIVE_INITIALIZER \ + _LIBC_LOCK_RECURSIVE_INITIALIZER +#define __rtld_lock_define_initialized_recursive(CLASS,NAME) \ + __libc_lock_define_initialized_recursive (CLASS, NAME) + +#define __libc_lock_init_recursive(NAME) \ + ({ \ + (NAME) = (__libc_lock_recursive_t)_LIBC_LOCK_RECURSIVE_INITIALIZER; \ + 0; \ + }) + +#define __libc_lock_trylock_recursive(NAME) \ + ({ \ + __libc_lock_recursive_t *const __lock = &(NAME); \ + void *__self = __libc_lock_owner_self (); \ + int __r = 0; \ + if (__self == __lock->owner) \ + ++__lock->cnt; \ + else if ((__r = lll_trylock (&__lock->lock)) == 0) \ + __lock->owner = __self, __lock->cnt = 1; \ + __r; \ + }) + +#define __libc_lock_lock_recursive(NAME) \ + ({ \ + __libc_lock_recursive_t *const __lock = &(NAME); \ + void *__self = __libc_lock_owner_self (); \ + if (__self != __lock->owner) \ + { \ + lll_lock (&__lock->lock, 0); \ + __lock->owner = __self; \ + } \ + ++__lock->cnt; \ + (void)0; \ + }) + +#define __libc_lock_unlock_recursive(NAME) \ + ({ \ + __libc_lock_recursive_t *const __lock = &(NAME); \ + if (--__lock->cnt == 0) \ + { \ + __lock->owner = 0; \ + lll_unlock (&__lock->lock, 0); \ + } \ + }) + + +#define __rtld_lock_initialize(NAME) \ + (void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER) +#define __rtld_lock_trylock_recursive(NAME) \ + __libc_lock_trylock_recursive (NAME) +#define __rtld_lock_lock_recursive(NAME) \ + __libc_lock_lock_recursive(NAME) +#define __rtld_lock_unlock_recursive(NAME) \ + __libc_lock_unlock_recursive (NAME) /* XXX for now */ #define __libc_rwlock_define __libc_lock_define @@ -95,7 +182,7 @@ __libc_cleanup_fct (struct __libc_cleanup_frame *framep) __attribute__ ((__cleanup__ (__libc_cleanup_fct))) = \ { .__fct = (FCT), .__argp = (ARG), .__doit = (DOIT) }; -/* This one closes the brace above. */ +/* This one closes the brace above. */ #define __libc_cleanup_region_end(DOIT) \ __cleanup.__doit = (DOIT); \ } \ @@ -106,7 +193,7 @@ __libc_cleanup_fct (struct __libc_cleanup_frame *framep) #define __libc_cleanup_push(fct, arg) __libc_cleanup_region_start (1, fct, arg) #define __libc_cleanup_pop(execute) __libc_cleanup_region_end (execute) -/* Use mutexes as once control variables. */ +/* Use mutexes as once control variables. */ struct __libc_once { @@ -115,8 +202,7 @@ struct __libc_once }; #define __libc_once_define(CLASS,NAME) \ - CLASS struct __libc_once NAME = { MUTEX_INITIALIZER, 0 } - + CLASS struct __libc_once NAME = { _LIBC_LOCK_INITIALIZER, 0 } /* Call handler iff the first call. */ #define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \ @@ -134,25 +220,11 @@ struct __libc_once #ifdef _LIBC /* We need portable names for some functions. E.g., when they are used as argument to __libc_cleanup_region_start. */ -#define __libc_mutex_unlock __mutex_unlock -#endif +#define __libc_mutex_unlock __libc_lock_unlock -#define __libc_key_create(KEY,DEST) __cthread_keycreate (KEY) -#define __libc_setspecific(KEY,VAL) __cthread_setspecific (KEY, VAL) -void *__libc_getspecific (__libc_key_t key); - -/* XXX until cthreads supports recursive locks */ -#define __libc_lock_define_initialized_recursive __libc_lock_define_initialized -#define __libc_lock_init_recursive __libc_lock_init -#define __libc_lock_fini_recursive __libc_lock_fini -#define __libc_lock_trylock_recursive __libc_lock_trylock -#define __libc_lock_unlock_recursive __libc_lock_unlock -#define __libc_lock_lock_recursive __libc_lock_lock - -#define __rtld_lock_define_initialized_recursive __libc_lock_define_initialized -#define __rtld_lock_fini_recursive __libc_lock_fini -#define __rtld_lock_trylock_recursive __libc_lock_trylock -#define __rtld_lock_unlock_recursive __libc_lock_unlock -#define __rtld_lock_lock_recursive __libc_lock_lock +/* Hide the definitions which are only supposed to be used inside libc in + a separate file. This file is not present in the installation! */ +# include <libc-lockP.h> +#endif #endif /* libc-lock.h */ |