feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/sntp_init_can_run_before_net_connection_v3.2' into 'release/v3.2'

Browse Source 
lw_ip: Add to sys_arch_protect() a check that the mutex is created before use if not then creates it (v3.2)

See merge request espressif/esp-idf!7759
This commit is contained in:
Jiang Jiang Jian
2020-03-13 20:10:33 +08:00
parent 11995d808c 874b18eab8
commit aeebe24196
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/lwip/port/esp32/freertos/sys_arch.c
View File

@@ -426,9 +426,11 @@ sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize
void void
sys_init(void) sys_init(void)
{ {
if (!g_lwip_protect_mutex) {
if (ERR_OK != sys_mutex_new(&g_lwip_protect_mutex)) { if (ERR_OK != sys_mutex_new(&g_lwip_protect_mutex)) {
ESP_LOGE(TAG, "sys_init: failed to init lwip protect mutex\n"); ESP_LOGE(TAG, "sys_init: failed to init lwip protect mutex\n");
} }
}
// Create the pthreads key for the per-thread semaphore storage // Create the pthreads key for the per-thread semaphore storage
pthread_key_create(&sys_thread_sem_key, sys_thread_sem_free); pthread_key_create(&sys_thread_sem_key, sys_thread_sem_free);
@@ -466,6 +468,9 @@ sys_now(void)
sys_prot_t sys_prot_t
sys_arch_protect(void) sys_arch_protect(void)
{ {
if (!g_lwip_protect_mutex) {
sys_mutex_new(&g_lwip_protect_mutex);
}
sys_mutex_lock(&g_lwip_protect_mutex); sys_mutex_lock(&g_lwip_protect_mutex);
return (sys_prot_t) 1; return (sys_prot_t) 1;
} }