Skip to content

Fix race condition in stream buffers when priority(IP task)==priority(task using TCP/IP) #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jul 7, 2022
Merged

Fix race condition in stream buffers when priority(IP task)==priority(task using TCP/IP) #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9810585
Update source location for coverity
AniruddhaKanhere May 26, 2022
e8704a3
Merge branch 'FreeRTOS:main' into main
AniruddhaKanhere Jun 1, 2022
dfd1eb3
Add coverage checker
AniruddhaKanhere Jun 1, 2022
ed0a199
Add build check with default configuration
AniruddhaKanhere Jun 1, 2022
690f42e
Fix build combination and DNS error
AniruddhaKanhere Jun 1, 2022
9d051fd
uncrustified and fixed cmakelists
AniruddhaKanhere Jun 1, 2022
17efec9
Merge branch 'FreeRTOS:main' into main
AniruddhaKanhere Jul 1, 2022
1798486
This commit updates version number in all files to Development-Branch
AniruddhaKanhere Jul 1, 2022
9baf09c
Merge branch 'FreeRTOS:main' into main
AniruddhaKanhere Jul 6, 2022
29f2c27
Update version number macros
AniruddhaKanhere Jul 6, 2022
8ef5462
This commit fixes a typo in version number macro
AniruddhaKanhere Jul 6, 2022
13fc92b
Merge branch 'main' into main
AniruddhaKanhere Jul 6, 2022
7c4f653
Added a 'critical section' to prevent a race condition in stream buffers
AniruddhaKanhere Jul 6, 2022
ae7cc2c
Merge branch 'main' into main
AniruddhaKanhere Jul 6, 2022
d000125
Uncrustify: triggered by comment.
actions-user Jul 6, 2022
0d132e9
Fixed unit-tests by adding mocked functions
AniruddhaKanhere Jul 6, 2022
9984e16
Merge branch 'main' of https://github.com/aniruddhakanhere/freertos-p…
AniruddhaKanhere Jul 6, 2022
b76e4c3
Merge branch 'main' into main
aggarg Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions source/FreeRTOS_Stream_Buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,24 +318,30 @@ size_t uxStreamBufferAdd( StreamBuffer_t * pxBuffer,
}
}

if( uxOffset == 0U )
/* The below update to the stream buffer members must happen
* atomically. */
vTaskSuspendAll();
{
/* ( uxOffset == 0 ) means: write at uxHead position */
uxNextHead += uxCount;

if( uxNextHead >= pxBuffer->LENGTH )
if( uxOffset == 0U )
{
uxNextHead -= pxBuffer->LENGTH;
}
/* ( uxOffset == 0 ) means: write at uxHead position */
uxNextHead += uxCount;

pxBuffer->uxHead = uxNextHead;
}
if( uxNextHead >= pxBuffer->LENGTH )
{
uxNextHead -= pxBuffer->LENGTH;
}

if( xStreamBufferLessThenEqual( pxBuffer, pxBuffer->uxFront, uxNextHead ) != pdFALSE )
{
/* Advance the front pointer */
pxBuffer->uxFront = uxNextHead;
pxBuffer->uxHead = uxNextHead;
}

if( xStreamBufferLessThenEqual( pxBuffer, pxBuffer->uxFront, uxNextHead ) != pdFALSE )
{
/* Advance the front pointer */
pxBuffer->uxFront = uxNextHead;
}
}
xTaskResumeAll();
}

return uxCount;
Expand Down
21 changes: 21 additions & 0 deletions test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,9 @@ void test_uxStreamBufferAdd_BufferHasMoreSpaceThanData_ZeroOffset_DataWriteCause

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, pucData, uxByteCount );

/* Only these many bytes should be written. */
Expand Down Expand Up @@ -654,6 +657,9 @@ void test_uxStreamBufferAdd_BufferHasLessSpaceThanData_ZeroOffset( void )

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, pucData, uxByteCount );

/* Only 500 bytes should be written. */
Expand Down Expand Up @@ -697,6 +703,9 @@ void test_uxStreamBufferAdd_BufferHasLessSpaceThanData_NonZeroOffset( void )

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, pucData, uxByteCount );

/* Only these many bytes should be written. */
Expand Down Expand Up @@ -749,6 +758,9 @@ void test_uxStreamBufferAdd_BufferHasLessSpaceThanData_NonZeroOffsetCausesRollov

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, pucData, uxByteCount );

/* Only these many bytes should be written. */
Expand Down Expand Up @@ -802,6 +814,9 @@ void test_uxStreamBufferAdd_BufferHasLessSpaceThanData_ZeroOffset_DataWriteCause

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, pucData, uxByteCount );

/* Only these many bytes should be written. */
Expand Down Expand Up @@ -859,6 +874,9 @@ void test_uxStreamBufferAdd_NULLData_BufferHasLessSpaceThanData_ZeroOffset_DataW

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, NULL, uxByteCount );

/* Nothing should be written but tail will be updated. */
Expand Down Expand Up @@ -912,6 +930,9 @@ void test_uxStreamBufferAdd_NULLData_BufferHasLessSpaceThanData_ZeroOffset_DataW

FreeRTOS_min_size_t_Stub( FreeRTOS_min_stub );

vTaskSuspendAll_Expect();
xTaskResumeAll_ExpectAndReturn( pdTRUE );

uxReturn = uxStreamBufferAdd( pxLocalBuffer, uxOffset, NULL, uxByteCount );

/* Nothing should be written but tail should be updated. */
Expand Down