diff options
author | Freddie Chopin <freddie.chopin@gmail.com> | 2017-01-29 12:27:17 +0300 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2017-02-07 00:55:09 +0300 |
commit | 0eeb4c1d32aab0dbfd2a8f20aa326ae2d98ca1c6 (patch) | |
tree | 169fb9fc713636bec44116ba64ca15d023401a92 /newlib/libc/stdlib | |
parent | 4e46ff3e8198adc00bbf4b4455c760ff0c599f44 (diff) |
Unify names of all lock objects
In preparation for the patch that would allow retargeting of locking
routines, rename all lock objects to follow this pattern:
"__<name>_[recursive_]mutex".
Following locks were renamed:
__dd_hash_lock -> __dd_hash_mutex
__sfp_lock -> __sfp_recursive_mutex
__sinit_lock -> __sinit_recursive_mutex
__atexit_lock -> __atexit_recursive_mutex
_arc4random_mutex -> __arc4random_mutex
__env_lock_object -> __env_recursive_mutex
__malloc_lock_object -> __malloc_recursive_mutex
__atexit_mutex -> __at_quick_exit_mutex
__tz_lock_object -> __tz_mutex
Diffstat (limited to 'newlib/libc/stdlib')
-rw-r--r-- | newlib/libc/stdlib/__atexit.c | 16 | ||||
-rw-r--r-- | newlib/libc/stdlib/__call_atexit.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdlib/arc4random.h | 6 | ||||
-rw-r--r-- | newlib/libc/stdlib/envlock.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdlib/mlock.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdlib/quick_exit.c | 6 |
6 files changed, 23 insertions, 23 deletions
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c index d07f6c122..0f4aeb8a9 100644 --- a/newlib/libc/stdlib/__atexit.c +++ b/newlib/libc/stdlib/__atexit.c @@ -48,7 +48,7 @@ const void * __atexit_dummy = &__call_exitprocs; #endif #ifndef __SINGLE_THREAD__ -extern _LOCK_RECURSIVE_T __atexit_lock; +extern _LOCK_RECURSIVE_T __atexit_recursive_mutex; #endif #ifdef _REENT_GLOBAL_ATEXIT @@ -74,7 +74,7 @@ _DEFUN (__register_exitproc, register struct _atexit *p; #ifndef __SINGLE_THREAD__ - __lock_acquire_recursive(__atexit_lock); + __lock_acquire_recursive(__atexit_recursive_mutex); #endif p = _GLOBAL_ATEXIT; @@ -91,7 +91,7 @@ _DEFUN (__register_exitproc, { #ifndef _ATEXIT_DYNAMIC_ALLOC #ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_lock); + __lock_release_recursive(__atexit_recursive_mutex); #endif return -1; #else @@ -100,7 +100,7 @@ _DEFUN (__register_exitproc, if (!malloc) { #ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_lock); + __lock_release_recursive(__atexit_recursive_mutex); #endif return -1; } @@ -109,7 +109,7 @@ _DEFUN (__register_exitproc, if (p == NULL) { #ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_lock); + __lock_release_recursive(__atexit_recursive_mutex); #endif return -1; } @@ -133,7 +133,7 @@ _DEFUN (__register_exitproc, { #ifndef _ATEXIT_DYNAMIC_ALLOC #ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_lock); + __lock_release_recursive(__atexit_recursive_mutex); #endif return -1; #else @@ -143,7 +143,7 @@ _DEFUN (__register_exitproc, if (args == NULL) { #ifndef __SINGLE_THREAD__ - __lock_release(__atexit_lock); + __lock_release(__atexit_recursive_mutex); #endif return -1; } @@ -163,7 +163,7 @@ _DEFUN (__register_exitproc, } p->_fns[p->_ind++] = fn; #ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_lock); + __lock_release_recursive(__atexit_recursive_mutex); #endif return 0; } diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c index 1e6e71044..7d5e0d046 100644 --- a/newlib/libc/stdlib/__call_atexit.c +++ b/newlib/libc/stdlib/__call_atexit.c @@ -11,7 +11,7 @@ /* Make this a weak reference to avoid pulling in free. */ void free(void *) _ATTRIBUTE((__weak__)); -__LOCK_INIT_RECURSIVE(, __atexit_lock); +__LOCK_INIT_RECURSIVE(, __atexit_recursive_mutex); #ifdef _REENT_GLOBAL_ATEXIT struct _atexit *_global_atexit = _NULL; @@ -75,7 +75,7 @@ _DEFUN (__call_exitprocs, (code, d), #ifndef __SINGLE_THREAD__ - __lock_acquire_recursive(__atexit_lock); + __lock_acquire_recursive(__atexit_recursive_mutex); #endif restart: @@ -157,7 +157,7 @@ _DEFUN (__call_exitprocs, (code, d), #endif } #ifndef __SINGLE_THREAD__ - __lock_release_recursive(__atexit_lock); + __lock_release_recursive(__atexit_recursive_mutex); #endif } diff --git a/newlib/libc/stdlib/arc4random.h b/newlib/libc/stdlib/arc4random.h index 54bcbe8ae..3c5fe2353 100644 --- a/newlib/libc/stdlib/arc4random.h +++ b/newlib/libc/stdlib/arc4random.h @@ -39,11 +39,11 @@ #ifndef _ARC4_LOCK_INIT -#define _ARC4_LOCK_INIT __LOCK_INIT(static, _arc4random_mutex); +#define _ARC4_LOCK_INIT __LOCK_INIT(static, __arc4random_mutex); -#define _ARC4_LOCK() __lock_acquire(_arc4random_mutex) +#define _ARC4_LOCK() __lock_acquire(__arc4random_mutex) -#define _ARC4_UNLOCK() __lock_release(_arc4random_mutex) +#define _ARC4_UNLOCK() __lock_release(__arc4random_mutex) #endif /* _ARC4_LOCK_INIT */ diff --git a/newlib/libc/stdlib/envlock.c b/newlib/libc/stdlib/envlock.c index ce7ae2e26..410a28a9c 100644 --- a/newlib/libc/stdlib/envlock.c +++ b/newlib/libc/stdlib/envlock.c @@ -39,7 +39,7 @@ that it already holds. #include <sys/lock.h> #ifndef __SINGLE_THREAD__ -__LOCK_INIT_RECURSIVE(static, __env_lock_object); +__LOCK_INIT_RECURSIVE(static, __env_recursive_mutex); #endif void @@ -47,7 +47,7 @@ __env_lock (ptr) struct _reent *ptr; { #ifndef __SINGLE_THREAD__ - __lock_acquire_recursive (__env_lock_object); + __lock_acquire_recursive (__env_recursive_mutex); #endif } @@ -56,6 +56,6 @@ __env_unlock (ptr) struct _reent *ptr; { #ifndef __SINGLE_THREAD__ - __lock_release_recursive (__env_lock_object); + __lock_release_recursive (__env_recursive_mutex); #endif } diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c index 888c986a9..4c392947d 100644 --- a/newlib/libc/stdlib/mlock.c +++ b/newlib/libc/stdlib/mlock.c @@ -40,7 +40,7 @@ that it already holds. #include <sys/lock.h> #ifndef __SINGLE_THREAD__ -__LOCK_INIT_RECURSIVE(static, __malloc_lock_object); +__LOCK_INIT_RECURSIVE(static, __malloc_recursive_mutex); #endif void @@ -48,7 +48,7 @@ __malloc_lock (ptr) struct _reent *ptr; { #ifndef __SINGLE_THREAD__ - __lock_acquire_recursive (__malloc_lock_object); + __lock_acquire_recursive (__malloc_recursive_mutex); #endif } @@ -57,7 +57,7 @@ __malloc_unlock (ptr) struct _reent *ptr; { #ifndef __SINGLE_THREAD__ - __lock_release_recursive (__malloc_lock_object); + __lock_release_recursive (__malloc_recursive_mutex); #endif } diff --git a/newlib/libc/stdlib/quick_exit.c b/newlib/libc/stdlib/quick_exit.c index 34f41b737..aaa5f9f7f 100644 --- a/newlib/libc/stdlib/quick_exit.c +++ b/newlib/libc/stdlib/quick_exit.c @@ -44,7 +44,7 @@ struct quick_exit_handler { /** * Lock protecting the handlers list. */ -__LOCK_INIT(static, __atexit_mutex); +__LOCK_INIT(static, __at_quick_exit_mutex); /** * Stack of cleanup handlers. These will be invoked in reverse order when */ @@ -60,10 +60,10 @@ at_quick_exit(void (*func)(void)) if (NULL == h) return (1); h->cleanup = func; - __lock_acquire(__atexit_mutex); + __lock_acquire(__at_quick_exit_mutex); h->next = handlers; handlers = h; - __lock_release(__atexit_mutex); + __lock_release(__at_quick_exit_mutex); return (0); } |