j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #529 from ourairquality/newlib-locks-combine

Browse source 
newlib: add an option to combine some locks.
This commit is contained in:
Ruslan V. Uss 2017-12-28 06:48:28 +05:00 committed by GitHub
commit 4ec3659a04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/newlib_syscalls.c
View file

@ -247,6 +247,10 @@ extern _lock_t __sinit_recursive_mutex;
void init_newlib_locks() void init_newlib_locks()
{ {
_lock_init(&__arc4random_mutex); _lock_init(&__arc4random_mutex);
#if 0
/* Separate mutex for each lock.
* Each mutex uses about 96 bytes which adds up. */
_lock_init(&__at_quick_exit_mutex); _lock_init(&__at_quick_exit_mutex);
//_lock_init(&__dd_hash_mutex); //_lock_init(&__dd_hash_mutex);
_lock_init(&__tz_mutex); _lock_init(&__tz_mutex);
@ -256,6 +260,21 @@ void init_newlib_locks()
_lock_init_recursive(&__malloc_recursive_mutex); _lock_init_recursive(&__malloc_recursive_mutex);
_lock_init_recursive(&__sfp_recursive_mutex); _lock_init_recursive(&__sfp_recursive_mutex);
_lock_init_recursive(&__sinit_recursive_mutex); _lock_init_recursive(&__sinit_recursive_mutex);
#else
/* Reuse the same mutex for all these, reducing memory usage. Newlib
* will still allocate other locks dynamically and some of those need
* to be separate such as the file lock where a thread might block with
* them held. */
__at_quick_exit_mutex = __arc4random_mutex;
//__dd_hash_mutex = __arc4random_mutex;
__tz_mutex = __arc4random_mutex;
__atexit_recursive_mutex = __arc4random_mutex;
__env_recursive_mutex = __arc4random_mutex;
__malloc_recursive_mutex = __arc4random_mutex;
__sfp_recursive_mutex = __arc4random_mutex;
__sinit_recursive_mutex = __arc4random_mutex;
#endif
locks_initialized = 1; locks_initialized = 1;
} }