espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/app_trace_use_try_critical_section_macro' into 'master'

Browse Source 
app_trace: Update esp_apptrace_lock_take() to use portTRY_ENTER_CRITICAL()

See merge request espressif/esp-idf!21094
This commit is contained in:
Darian
2022-12-28 16:55:00 +08:00
parent 84a6c6f7d9 cc5ee295ad
commit 1c5ef9cb7c
1 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
components/app_trace/app_trace_util.c
View File

@@ -57,47 +57,26 @@ esp_err_t esp_apptrace_tmo_check(esp_apptrace_tmo_t *tmo)
esp_err_t esp_apptrace_lock_take(esp_apptrace_lock_t *lock, esp_apptrace_tmo_t *tmo) esp_err_t esp_apptrace_lock_take(esp_apptrace_lock_t *lock, esp_apptrace_tmo_t *tmo)
{ {
int res; esp_err_t ret;
while (1) { while (1) {
//Todo: Replace the current locking mechanism and int_state with portTRY_ENTER_CRITICAL() instead. // Try enter a critical section (i.e., take the spinlock) with 0 timeout
// do not overwrite lock->int_state before we actually acquired the mux if (portTRY_ENTER_CRITICAL(&(lock->mux), 0) == pdTRUE) {
#if CONFIG_FREERTOS_SMP
unsigned int_state = portDISABLE_INTERRUPTS();
#else
unsigned int_state = portSET_INTERRUPT_MASK_FROM_ISR();
#endif
bool success = spinlock_acquire(&lock->mux, 0);
if (success) {
lock->int_state = int_state;
return ESP_OK; return ESP_OK;
} }
#if CONFIG_FREERTOS_SMP // Failed to enter the critical section, so interrupts are still enabled. Check if we have timed out.
portRESTORE_INTERRUPTS(int_state); ret = esp_apptrace_tmo_check(tmo);
#else if (ret != ESP_OK) {
portCLEAR_INTERRUPT_MASK_FROM_ISR(int_state); break; // Timed out, exit now
#endif
// we can be preempted from this place till the next call (above) to portSET_INTERRUPT_MASK_FROM_ISR()
res = esp_apptrace_tmo_check(tmo);
if (res != ESP_OK) {
break;
} }
// Haven't timed out, try again
} }
return res; return ret;
} }
esp_err_t esp_apptrace_lock_give(esp_apptrace_lock_t *lock) esp_err_t esp_apptrace_lock_give(esp_apptrace_lock_t *lock)
{ {
// save lock's irq state value for this CPU portEXIT_CRITICAL(&(lock->mux));
unsigned int_state = lock->int_state;
// after call to the following func we can not be sure that lock->int_state
// is not overwritten by other CPU who has acquired the mux just after we released it. See esp_apptrace_lock_take().
spinlock_release(&lock->mux);
#if CONFIG_FREERTOS_SMP
portRESTORE_INTERRUPTS(int_state);
#else
portCLEAR_INTERRUPT_MASK_FROM_ISR(int_state);
#endif
return ESP_OK; return ESP_OK;
} }