alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

esp32/Add mutex for dual core hooks

Browse Source 
This commit adds critical sections for the dual core hooks
This commit is contained in:
Darian Leung 2017-10-16 11:47:38 +08:00
parent b013f5d490
commit 7584f89278
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/esp32/freertos_hooks.c
View File

@ -24,6 +24,7 @@
//an idle or tick hook. //an idle or tick hook.
#define MAX_HOOKS 8 #define MAX_HOOKS 8
static portMUX_TYPE hooks_spinlock = portMUX_INITIALIZER_UNLOCKED;
static esp_freertos_idle_cb_t idle_cb[portNUM_PROCESSORS][MAX_HOOKS]={0}; static esp_freertos_idle_cb_t idle_cb[portNUM_PROCESSORS][MAX_HOOKS]={0};
static esp_freertos_tick_cb_t tick_cb[portNUM_PROCESSORS][MAX_HOOKS]={0}; static esp_freertos_tick_cb_t tick_cb[portNUM_PROCESSORS][MAX_HOOKS]={0};
@ -61,12 +62,15 @@ esp_err_t esp_register_freertos_idle_hook_for_cpu(esp_freertos_idle_cb_t new_idl
if(cpuid >= portNUM_PROCESSORS){ if(cpuid >= portNUM_PROCESSORS){
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
portENTER_CRITICAL(&hooks_spinlock);
for(int n = 0; n < MAX_HOOKS; n++){ for(int n = 0; n < MAX_HOOKS; n++){
if (idle_cb[cpuid][n]==NULL) { if (idle_cb[cpuid][n]==NULL) {
idle_cb[cpuid][n]=new_idle_cb; idle_cb[cpuid][n]=new_idle_cb;
portEXIT_CRITICAL(&hooks_spinlock);
return ESP_OK; return ESP_OK;
} }
} }
portEXIT_CRITICAL(&hooks_spinlock);
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
@ -80,12 +84,15 @@ esp_err_t esp_register_freertos_tick_hook_for_cpu(esp_freertos_tick_cb_t new_tic
if(cpuid >= portNUM_PROCESSORS){ if(cpuid >= portNUM_PROCESSORS){
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
portENTER_CRITICAL(&hooks_spinlock);
for(int n = 0; n < MAX_HOOKS; n++){ for(int n = 0; n < MAX_HOOKS; n++){
if (tick_cb[cpuid][n]==NULL) { if (tick_cb[cpuid][n]==NULL) {
tick_cb[cpuid][n]=new_tick_cb; tick_cb[cpuid][n]=new_tick_cb;
portEXIT_CRITICAL(&hooks_spinlock);
return ESP_OK; return ESP_OK;
} }
} }
portEXIT_CRITICAL(&hooks_spinlock);
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
@ -96,19 +103,23 @@ esp_err_t esp_register_freertos_tick_hook(esp_freertos_tick_cb_t new_tick_cb)
void esp_deregister_freertos_idle_hook(esp_freertos_idle_cb_t old_idle_cb) void esp_deregister_freertos_idle_hook(esp_freertos_idle_cb_t old_idle_cb)
{ {
portENTER_CRITICAL(&hooks_spinlock);
for(int m = 0; m < portNUM_PROCESSORS; m++) { for(int m = 0; m < portNUM_PROCESSORS; m++) {
for(int n = 0; n < MAX_HOOKS; n++){ for(int n = 0; n < MAX_HOOKS; n++){
if(idle_cb[m][n] == old_idle_cb) idle_cb[m][n] = NULL; if(idle_cb[m][n] == old_idle_cb) idle_cb[m][n] = NULL;
} }
} }
portEXIT_CRITICAL(&hooks_spinlock);
} }
void esp_deregister_freertos_tick_hook(esp_freertos_tick_cb_t old_tick_cb) void esp_deregister_freertos_tick_hook(esp_freertos_tick_cb_t old_tick_cb)
{ {
portENTER_CRITICAL(&hooks_spinlock);
for(int m = 0; m < portNUM_PROCESSORS; m++){ for(int m = 0; m < portNUM_PROCESSORS; m++){
for(int n = 0; n < MAX_HOOKS; n++){ for(int n = 0; n < MAX_HOOKS; n++){
if(tick_cb[m][n] == old_tick_cb) tick_cb[m][n] = NULL; if(tick_cb[m][n] == old_tick_cb) tick_cb[m][n] = NULL;
} }
} }
portEXIT_CRITICAL(&hooks_spinlock);
} }