len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix traceMALLOC() memory count is inaccurate. (#1078)

Browse source 
Modify xWantedSize to the size of a free block when not split blocks.

Ensure that the sizes within traceMALLOC() and traceFREE() macros are equal.
This commit is contained in:
WangGaoJie 2024-06-11 09:38:27 +08:00
parent e64d1e06b3
commit 2d5c193a0f
14 changed files with 59 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
portable/ARMv8M/secure/heap/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/GCC/ARM_CM23/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/GCC/ARM_CM33/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/GCC/ARM_CM35P/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/GCC/ARM_CM55/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/GCC/ARM_CM85/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/IAR/ARM_CM23/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/IAR/ARM_CM33/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/IAR/ARM_CM35P/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/IAR/ARM_CM55/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

5
portable/IAR/ARM_CM85/secure/secure_heap.c
View file

@ -360,7 +360,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -396,6 +396,9 @@ void * pvPortMalloc( size_t xWantedSize )
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
#if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 ) #if ( secureconfigUSE_MALLOC_FAILED_HOOK == 1 )
{ {
if( pvReturn == NULL ) if( pvReturn == NULL )

7
portable/MemMang/heap_2.c
View file

@ -258,6 +258,10 @@ void * pvPortMalloc( size_t xWantedSize )
* iterate to find the right place to insert new block. */ * iterate to find the right place to insert new block. */
prvInsertBlockIntoFreeList( ( pxNewBlockLink ) ); prvInsertBlockIntoFreeList( ( pxNewBlockLink ) );
} }
else
{
xWantedSize = pxBlock->xBlockSize;
}
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -270,6 +274,9 @@ void * pvPortMalloc( size_t xWantedSize )
} }
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
} }
( void ) xTaskResumeAll(); ( void ) xTaskResumeAll();

5
portable/MemMang/heap_4.c
View file

@ -288,7 +288,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -324,6 +324,9 @@ void * pvPortMalloc( size_t xWantedSize )
} }
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
} }
( void ) xTaskResumeAll(); ( void ) xTaskResumeAll();

5
portable/MemMang/heap_5.c
View file

@ -316,7 +316,7 @@ void * pvPortMalloc( size_t xWantedSize )
} }
else else
{ {
mtCOVERAGE_TEST_MARKER(); xWantedSize = pxBlock->xBlockSize;
} }
xFreeBytesRemaining -= pxBlock->xBlockSize; xFreeBytesRemaining -= pxBlock->xBlockSize;
@ -352,6 +352,9 @@ void * pvPortMalloc( size_t xWantedSize )
} }
traceMALLOC( pvReturn, xWantedSize ); traceMALLOC( pvReturn, xWantedSize );
/* Prevent compiler warnings when trace macros are not used. */
( void ) xWantedSize;
} }
( void ) xTaskResumeAll(); ( void ) xTaskResumeAll();