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

Merge branch 'bugfix/freertos_tick_hook_build_issue' into 'master'

Browse Source 
fix(freertos/idf): Fix build error when CONFIG_FREERTOS_USE_TICK_HOOK is enabled

Closes IDFGH-12247

See merge request espressif/esp-idf!29380
This commit is contained in:
Darian
2024-03-05 19:26:58 +08:00
parent 131dfbef9b f9965e3092
commit b7428bcf7d
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/freertos/FreeRTOS-Kernel/tasks.c
View File

@ -3356,7 +3356,7 @@ BaseType_t xTaskIncrementTick( void )
{ {
/* Guard against the tick hook being called when the pended tick /* Guard against the tick hook being called when the pended tick
* count is being unwound (when the scheduler is being unlocked). */ * count is being unwound (when the scheduler is being unlocked). */
if( xPendedTicksTemp == ( TickType_t ) 0 ) if( xPendedTicks == ( TickType_t ) 0 )
{ {
xCallTickHook = pdTRUE; xCallTickHook = pdTRUE;
} }

14
components/freertos/test_apps/freertos/kernel/tasks/test_freertos_hooks.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -18,11 +18,11 @@ a definition for vApplicationTickHook(). Thus this test cannot be run.
#include "unity.h" #include "unity.h"
#include "test_utils.h" #include "test_utils.h"
#ifndef CONFIG_FREERTOS_SMP #if !CONFIG_FREERTOS_SMP
/* /*
Test FreeRTOS idle hook. Only compiled in if FreeRTOS idle hooks are enabled. Test FreeRTOS idle hook. Only compiled in if FreeRTOS idle hooks are enabled.
*/ */
#if ( configUSE_IDLE_HOOK == 1 ) #if CONFIG_FREERTOS_USE_IDLE_HOOK
static volatile unsigned idle_count; static volatile unsigned idle_count;
@ -38,12 +38,12 @@ TEST_CASE("FreeRTOS idle hook", "[freertos]")
TEST_ASSERT_NOT_EQUAL(0, idle_count); // The legacy idle hook should be called at least once TEST_ASSERT_NOT_EQUAL(0, idle_count); // The legacy idle hook should be called at least once
} }
#endif // configUSE_IDLE_HOOK #endif // CONFIG_FREERTOS_USE_IDLE_HOOK
/* /*
Test the FreeRTOS tick hook. Only compiled in if FreeRTOS tick hooks are enabled. Test the FreeRTOS tick hook. Only compiled in if FreeRTOS tick hooks are enabled.
*/ */
#if ( configUSE_TICK_HOOK == 1 ) #if CONFIG_FREERTOS_USE_TICK_HOOK
static volatile unsigned tick_count; static volatile unsigned tick_count;
@ -62,8 +62,8 @@ TEST_CASE("FreeRTOS tick hook", "[freertos]")
"The FreeRTOS tick hook should have been called approx 1 time per tick per CPU"); "The FreeRTOS tick hook should have been called approx 1 time per tick per CPU");
} }
#endif // configUSE_TICK_HOOK #endif // CONFIG_FREERTOS_USE_TICK_HOOK
#endif // CONFIG_FREERTOS_SMP #endif // !CONFIG_FREERTOS_SMP
#if CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK #if CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK

2
components/freertos/test_apps/freertos/sdkconfig.ci.freertos_options
View File

@ -19,3 +19,5 @@ CONFIG_FREERTOS_FPU_IN_ISR=y
CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
CONFIG_FREERTOS_USE_LIST_DATA_INTEGRITY_CHECK_BYTES=y CONFIG_FREERTOS_USE_LIST_DATA_INTEGRITY_CHECK_BYTES=y
CONFIG_FREERTOS_TIMER_TASK_AFFINITY_CPU1=y CONFIG_FREERTOS_TIMER_TASK_AFFINITY_CPU1=y
CONFIG_FREERTOS_USE_TICK_HOOK=y
CONFIG_FREERTOS_USE_IDLE_HOOK=y