Skip to content

Alternative function for potential optimization of data copying in stream buffers #1233

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 4 commits into from
Mar 13, 2025
Merged

Alternative function for potential optimization of data copying in stream buffers #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f4afd7
Added the ability to use an alternative function to copy data in stre…
devprodest Mar 12, 2025
22105bc
Uncrustify: triggered by comment.
actions-user Mar 13, 2025
1c52f67
Revert "Uncrustify: triggered by comment."
tony-josi-aws Mar 13, 2025
15640c4
Fix formatting
tony-josi-aws Mar 13, 2025
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
8 changes: 4 additions & 4 deletions source/FreeRTOS_Stream_Buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,15 @@ size_t uxStreamBufferAdd( StreamBuffer_t * const pxBuffer,
const size_t uxFirst = FreeRTOS_min_size_t( uxLength - uxNextHead, uxCount );

/* Write as many bytes as can be written in the first write. */
( void ) memcpy( &( pxBuffer->ucArray[ uxNextHead ] ), pucData, uxFirst );
( void ) pvPortMemCpyStreamBuffer( &( pxBuffer->ucArray[ uxNextHead ] ), pucData, uxFirst );

/* If the number of bytes written was less than the number that
* could be written in the first write... */
if( uxCount > uxFirst )
{
/* ...then write the remaining bytes to the start of the
* buffer. */
( void ) memcpy( pxBuffer->ucArray, &( pucData[ uxFirst ] ), uxCount - uxFirst );
( void ) pvPortMemCpyStreamBuffer( pxBuffer->ucArray, &( pucData[ uxFirst ] ), uxCount - uxFirst );
}
}

Expand Down Expand Up @@ -394,14 +394,14 @@ size_t uxStreamBufferGet( StreamBuffer_t * const pxBuffer,

/* Obtain the number of bytes it is possible to obtain in the first
* read. */
( void ) memcpy( pucData, &( pxBuffer->ucArray[ uxNextTail ] ), uxFirst );
( void ) pvPortMemCpyStreamBuffer( pucData, &( pxBuffer->ucArray[ uxNextTail ] ), uxFirst );

/* If the total number of wanted bytes is greater than the number
* that could be read in the first read... */
if( uxCount > uxFirst )
{
/* ...then read the remaining bytes from the start of the buffer. */
( void ) memcpy( &( pucData[ uxFirst ] ), pxBuffer->ucArray, uxCount - uxFirst );
( void ) pvPortMemCpyStreamBuffer( &( pucData[ uxFirst ] ), pxBuffer->ucArray, uxCount - uxFirst );
}
}

Expand Down
25 changes: 24 additions & 1 deletion source/include/FreeRTOSIPConfigDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2151,10 +2151,33 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY );
#define vPortFreeSocket( ptr ) vPortFree( ptr )
#endif

/*===========================================================================*/
/* SOCKET CONFIG */
/*===========================================================================*/
/*---------------------------------------------------------------------------*/
/*===========================================================================*/
/*---------------------------------------------------------------------------*/
/*===========================================================================*/
/* STREAM BUFFER CONFIG */
/*===========================================================================*/

/*---------------------------------------------------------------------------*/

/*
* pvPortMemCpyStreamBuffer
*
* Function to copy data into the stream buffer when sending
* and copy data from the stream buffer when receiving.
*/

#ifndef pvPortMemCpyStreamBuffer
#define pvPortMemCpyStreamBuffer( dst, src, count ) memcpy( dst, src, count )
#endif

/*---------------------------------------------------------------------------*/

/*===========================================================================*/
/* SOCKET CONFIG */
/* STREAM BUFFER CONFIG */
/*===========================================================================*/
/*---------------------------------------------------------------------------*/
/*===========================================================================*/
Expand Down
Loading