espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-07-30 14:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

porting/linux: fix deadlock in ble_npl_hw_enter_critical

Browse Source 
Fix wrong mutex attributes in pthread_mutexattr_settype.
It can cause deadlock after locked.

Signed-off-by: Hang Fan <[email protected]>
This commit is contained in:
Hang Fan
2023-09-20 08:50:43 +02:00
committed by Szymon Janc
parent c1e26371c6
commit 9d4f474bf8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
porting/npl/linux/src/os_atomic.c
+4 -4
View File
@@ -23,21 +23,21 @@
#include "nimble/nimble_npl.h"
static pthread_mutex_t s_mutex = PTHREAD_MUTEX_INITIALIZER;
static struct ble_npl_mutex s_mutex;
static uint8_t s_mutex_inited = 0;
uint32_t ble_npl_hw_enter_critical(void)
{
if( !s_mutex_inited ) {
pthread_mutexattr_settype(&s_mutex, PTHREAD_MUTEX_RECURSIVE);
ble_npl_mutex_init(&s_mutex);
s_mutex_inited = 1;
}
pthread_mutex_lock(&s_mutex);
pthread_mutex_lock(&s_mutex.lock);
return 0;
}
void ble_npl_hw_exit_critical(uint32_t ctx)
{
pthread_mutex_unlock(&s_mutex);
pthread_mutex_unlock(&s_mutex.lock);
}