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

Merge branch 'bugfix/pvs_studio_freertos' into 'master'

Browse Source 
freertos: fix errors reported by PVS-Studio

Closes IDF-2784

See merge request espressif/esp-idf!12337
This commit is contained in:
Angus Gratton
2021-02-11 15:32:18 +08:00
parent c665bcf733 4eb9cc68a6
commit 1544f64166
3 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_event/test/CMakeLists.txt
View File

@@ -1,3 +1,8 @@
idf_component_register(SRC_DIRS "." idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS . ../private_include PRIV_INCLUDE_DIRS . ../private_include
PRIV_REQUIRES cmock test_utils esp_event driver) PRIV_REQUIRES cmock test_utils esp_event driver)
if(CONFIG_IDF_TARGET_ARCH_RISCV)
# Temporary workaround for a linker issue on RISC-V that should be resolved in binutils 2.35 (internal ref: GCC-101)
target_compile_options(${COMPONENT_LIB} PRIVATE -mno-relax)
endif()

10
components/freertos/event_groups.c
View File

@@ -198,7 +198,6 @@ EventBits_t xEventGroupSync( EventGroupHandle_t xEventGroup, const EventBits_t u
{ {
EventBits_t uxOriginalBitValue, uxReturn; EventBits_t uxOriginalBitValue, uxReturn;
EventGroup_t *pxEventBits = xEventGroup; EventGroup_t *pxEventBits = xEventGroup;
BaseType_t xAlreadyYielded = pdFALSE;
BaseType_t xTimeoutOccurred = pdFALSE; BaseType_t xTimeoutOccurred = pdFALSE;
configASSERT( ( uxBitsToWaitFor & eventEVENT_BITS_CONTROL_BYTES ) == 0 ); configASSERT( ( uxBitsToWaitFor & eventEVENT_BITS_CONTROL_BYTES ) == 0 );
@@ -257,14 +256,7 @@ BaseType_t xTimeoutOccurred = pdFALSE;
if( xTicksToWait != ( TickType_t ) 0 ) if( xTicksToWait != ( TickType_t ) 0 )
{ {
if( xAlreadyYielded == pdFALSE ) portYIELD_WITHIN_API();
{
portYIELD_WITHIN_API();
}
else
{
mtCOVERAGE_TEST_MARKER();
}
/* The task blocked to wait for its required bits to be set - at this /* The task blocked to wait for its required bits to be set - at this
point either the required bits were set or the block time expired. If point either the required bits were set or the block time expired. If

29
components/freertos/tasks.c
View File

@@ -1406,7 +1406,7 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
void vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, const TickType_t xTimeIncrement ) void vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, const TickType_t xTimeIncrement )
{ {
TickType_t xTimeToWake; TickType_t xTimeToWake;
BaseType_t xAlreadyYielded = pdFALSE, xShouldDelay = pdFALSE; BaseType_t xShouldDelay = pdFALSE;
configASSERT( pxPreviousWakeTime ); configASSERT( pxPreviousWakeTime );
configASSERT( ( xTimeIncrement > 0U ) ); configASSERT( ( xTimeIncrement > 0U ) );
@@ -1470,16 +1470,8 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
} }
taskEXIT_CRITICAL( &xTaskQueueMutex ); taskEXIT_CRITICAL( &xTaskQueueMutex );
/* Force a reschedule if xTaskResumeAll has not already done so, we may /* Force a reschedule, we may have put ourselves to sleep. */
have put ourselves to sleep. */ portYIELD_WITHIN_API();
if( xAlreadyYielded == pdFALSE )
{
portYIELD_WITHIN_API();
}
else
{
mtCOVERAGE_TEST_MARKER();
}
} }
#endif /* INCLUDE_vTaskDelayUntil */ #endif /* INCLUDE_vTaskDelayUntil */
@@ -1489,8 +1481,6 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
void vTaskDelay( const TickType_t xTicksToDelay ) void vTaskDelay( const TickType_t xTicksToDelay )
{ {
BaseType_t xAlreadyYielded = pdFALSE;
/* A delay time of zero just forces a reschedule. */ /* A delay time of zero just forces a reschedule. */
if( xTicksToDelay > ( TickType_t ) 0U ) if( xTicksToDelay > ( TickType_t ) 0U )
{ {
@@ -1515,18 +1505,11 @@ static void prvAddNewTaskToReadyList( TCB_t *pxNewTCB, TaskFunction_t pxTaskCode
mtCOVERAGE_TEST_MARKER(); mtCOVERAGE_TEST_MARKER();
} }
/* Force a reschedule if xTaskResumeAll has not already done so, we may /* Force a reschedule, we may have put ourselves to sleep. */
have put ourselves to sleep. */ portYIELD_WITHIN_API();
if( xAlreadyYielded == pdFALSE )
{
portYIELD_WITHIN_API();
}
else
{
mtCOVERAGE_TEST_MARKER();
}
} }
#endif /* INCLUDE_vTaskDelay */ #endif /* INCLUDE_vTaskDelay */
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/