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

Merge branch 'bugfix/ci_ut_esp_timer_isr_dispath_method_is_not_blocked' into 'master'

Browse Source 
esp_timer: Fix Test ESP_TIMER_ISR dispatch method is not blocked

Closes IDFCI-470

See merge request espressif/esp-idf!12484
This commit is contained in:
Angus Gratton
2021-02-24 10:07:47 +00:00
parent 7ef60b8bde 7bbf4a3422
commit a38b2c2773
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_timer/src/esp_timer.c
View File

@@ -568,16 +568,16 @@ esp_err_t esp_timer_dump(FILE* stream)
timer_list_unlock(dispatch_method); timer_list_unlock(dispatch_method);
} }
fprintf(stream, "Timer stats:\n"); if (stream != NULL) {
fprintf(stream, "Timer stats:\n");
#if WITH_PROFILING #if WITH_PROFILING
fprintf(stream, "%-20s %-10s %-12s %-12s %-12s %-12s %-12s\n", fprintf(stream, "%-20s %-10s %-12s %-12s %-12s %-12s %-12s\n",
"Name", "Period", "Alarm", "Times_armed", "Times_trigg", "Times_skip", "Cb_exec_time"); "Name", "Period", "Alarm", "Times_armed", "Times_trigg", "Times_skip", "Cb_exec_time");
#else #else
fprintf(stream, "%-20s %-10s %-12s\n", "Name", "Period", "Alarm"); fprintf(stream, "%-20s %-10s %-12s\n", "Name", "Period", "Alarm");
#endif #endif
/* Print the buffer */ /* Print the buffer */
if (stream != NULL) {
fputs(print_buf, stream); fputs(print_buf, stream);
} }