michaelh/zephyr
1
0
Fork 0
Code Releases Activity

PTHREAD_MUTEX_DEFINE(): don't store into the _k_mutex section

Browse source 
The _k_mutex linker section is used to gather instances of
struct k_mutex into a list so that init_mutex_module() could iterate
that list to perform runtime initialization tasks. In this case, we're
not defining a struct k_mutex but rather a struct pthread_mutex which is
a completely different structure. Not only those struct pthread_mutex
would be corrupted with unexpected data, but since they're not the
same size as struct k_mutex, the actual struct k_mutex instances that
follow in the list would be misaligned and get corrupted too.

There is nothing that requires runtime initialization in the static
definition of a struct pthread_mutex so let's remove the section
attribute.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2019-06-03 10:22:31 -04:00 • committed by Anas Nashif
commit ca49d6a857
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/posix/pthread.h
View file

@ -160,8 +160,7 @@ static inline int pthread_condattr_destroy(pthread_condattr_t *att)
* @param name Symbol name of the mutex
*/
#define PTHREAD_MUTEX_DEFINE(name) \
struct pthread_mutex name \
__in_section(_k_mutex, static, name) = \
struct pthread_mutex name = \
{ \
.lock_count = 0, \
.wait_q = Z_WAIT_Q_INIT(&name.wait_q), \