Skip to content
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

Include current task runtime in ulTaskGetRunTimeCounter #1234

Merged
merged 9 commits into from
Feb 12, 2025
+70 −18
Merged

Include current task runtime in ulTaskGetRunTimeCounter #1234

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e6e934
Include current task runtime in ulTaskGetRunTimeCounter
aggarg Jan 30, 2025
b736fc8
Fix CI formatting check
aggarg Jan 30, 2025
64b3f74
Merge branch 'main' into ulTaskGetRunTimeCounter
kar-rahul-aws Feb 6, 2025
c7e59d6
Merge branch 'main' into ulTaskGetRunTimeCounter
kar-rahul-aws Feb 7, 2025
6d040eb
Merge branch 'main' into ulTaskGetRunTimeCounter
kar-rahul-aws Feb 10, 2025
3712f51
Update Idle task runtime calculations
aggarg Feb 12, 2025
99d3767
Update vTaskGetInfo
aggarg Feb 12, 2025
36cb6af
Merge branch 'main' into ulTaskGetRunTimeCounter
aggarg Feb 12, 2025
76f639c
Fix formatting check
aggarg Feb 12, 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
88 changes: 70 additions & 18 deletions tasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6215,7 +6215,7 @@ static void prvCheckTasksWaitingTermination( void )

#if ( configGENERATE_RUN_TIME_STATS == 1 )
{
pxTaskStatus->ulRunTimeCounter = pxTCB->ulRunTimeCounter;
pxTaskStatus->ulRunTimeCounter = ulTaskGetRunTimeCounter( xTask );
}
#else
{
Expand Down Expand Up @@ -8415,15 +8415,37 @@ TickType_t uxTaskResetEventItemValue( void )
configRUN_TIME_COUNTER_TYPE ulTaskGetRunTimeCounter( const TaskHandle_t xTask )
{
TCB_t * pxTCB;
configRUN_TIME_COUNTER_TYPE ulTotalTime = 0, ulTimeSinceLastSwitchedIn = 0, ulTaskRunTime = 0;

traceENTER_ulTaskGetRunTimeCounter( xTask );

pxTCB = prvGetTCBFromHandle( xTask );
configASSERT( pxTCB != NULL );

traceRETURN_ulTaskGetRunTimeCounter( pxTCB->ulRunTimeCounter );
taskENTER_CRITICAL();
{
if( taskTASK_IS_RUNNING( pxTCB ) == pdTRUE )
{
#ifdef portALT_GET_RUN_TIME_COUNTER_VALUE
portALT_GET_RUN_TIME_COUNTER_VALUE( ulTotalTime );
#else
ulTotalTime = portGET_RUN_TIME_COUNTER_VALUE();
#endif

#if ( configNUMBER_OF_CORES == 1 )
ulTimeSinceLastSwitchedIn = ulTotalTime - ulTaskSwitchedInTime[ 0 ];
#else
ulTimeSinceLastSwitchedIn = ulTotalTime - ulTaskSwitchedInTime[ pxTCB->xTaskRunState ];
#endif
}

return pxTCB->ulRunTimeCounter;
ulTaskRunTime = pxTCB->ulRunTimeCounter + ulTimeSinceLastSwitchedIn;
}
taskEXIT_CRITICAL();

traceRETURN_ulTaskGetRunTimeCounter( ulTaskRunTime );

return ulTaskRunTime;
}

#endif /* if ( configGENERATE_RUN_TIME_STATS == 1 ) */
Expand All @@ -8434,11 +8456,17 @@ TickType_t uxTaskResetEventItemValue( void )
configRUN_TIME_COUNTER_TYPE ulTaskGetRunTimePercent( const TaskHandle_t xTask )
{
TCB_t * pxTCB;
configRUN_TIME_COUNTER_TYPE ulTotalTime, ulReturn;
configRUN_TIME_COUNTER_TYPE ulTotalTime, ulReturn, ulTaskRunTime;

traceENTER_ulTaskGetRunTimePercent( xTask );

ulTotalTime = ( configRUN_TIME_COUNTER_TYPE ) portGET_RUN_TIME_COUNTER_VALUE();
ulTaskRunTime = ulTaskGetRunTimeCounter( xTask );

#ifdef portALT_GET_RUN_TIME_COUNTER_VALUE
portALT_GET_RUN_TIME_COUNTER_VALUE( ulTotalTime );
#else
ulTotalTime = ( configRUN_TIME_COUNTER_TYPE ) portGET_RUN_TIME_COUNTER_VALUE();
#endif

/* For percentage calculations. */
ulTotalTime /= ( configRUN_TIME_COUNTER_TYPE ) 100;
Expand All @@ -8449,7 +8477,7 @@ TickType_t uxTaskResetEventItemValue( void )
pxTCB = prvGetTCBFromHandle( xTask );
configASSERT( pxTCB != NULL );

ulReturn = pxTCB->ulRunTimeCounter / ulTotalTime;
ulReturn = ulTaskRunTime / ulTotalTime;
}
else
{
Expand All @@ -8468,19 +8496,42 @@ TickType_t uxTaskResetEventItemValue( void )

configRUN_TIME_COUNTER_TYPE ulTaskGetIdleRunTimeCounter( void )
{
configRUN_TIME_COUNTER_TYPE ulReturn = 0;
configRUN_TIME_COUNTER_TYPE ulTotalTime = 0, ulTimeSinceLastSwitchedIn = 0, ulIdleTaskRunTime = 0;
BaseType_t i;

traceENTER_ulTaskGetIdleRunTimeCounter();

for( i = 0; i < ( BaseType_t ) configNUMBER_OF_CORES; i++ )
taskENTER_CRITICAL();
{
ulReturn += xIdleTaskHandles[ i ]->ulRunTimeCounter;
#ifdef portALT_GET_RUN_TIME_COUNTER_VALUE
portALT_GET_RUN_TIME_COUNTER_VALUE( ulTotalTime );
#else
ulTotalTime = portGET_RUN_TIME_COUNTER_VALUE();
#endif

for( i = 0; i < ( BaseType_t ) configNUMBER_OF_CORES; i++ )
{
if( taskTASK_IS_RUNNING( xIdleTaskHandles[ i ] ) == pdTRUE )
{
#if ( configNUMBER_OF_CORES == 1 )
ulTimeSinceLastSwitchedIn = ulTotalTime - ulTaskSwitchedInTime[ 0 ];
#else
ulTimeSinceLastSwitchedIn = ulTotalTime - ulTaskSwitchedInTime[ xIdleTaskHandles[ i ]->xTaskRunState ];
#endif
}
else
{
ulTimeSinceLastSwitchedIn = 0;
}

ulIdleTaskRunTime += ( xIdleTaskHandles[ i ]->ulRunTimeCounter + ulTimeSinceLastSwitchedIn );
}
}
taskEXIT_CRITICAL();

traceRETURN_ulTaskGetIdleRunTimeCounter( ulReturn );
traceRETURN_ulTaskGetIdleRunTimeCounter( ulIdleTaskRunTime );

return ulReturn;
return ulIdleTaskRunTime;
}

#endif /* if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( INCLUDE_xTaskGetIdleTaskHandle == 1 ) ) */
Expand All @@ -8492,23 +8543,24 @@ TickType_t uxTaskResetEventItemValue( void )
{
configRUN_TIME_COUNTER_TYPE ulTotalTime, ulReturn;
configRUN_TIME_COUNTER_TYPE ulRunTimeCounter = 0;
BaseType_t i;

traceENTER_ulTaskGetIdleRunTimePercent();

ulTotalTime = portGET_RUN_TIME_COUNTER_VALUE() * configNUMBER_OF_CORES;
#ifdef portALT_GET_RUN_TIME_COUNTER_VALUE
portALT_GET_RUN_TIME_COUNTER_VALUE( ulTotalTime );
#else
ulTotalTime = ( configRUN_TIME_COUNTER_TYPE ) portGET_RUN_TIME_COUNTER_VALUE();
#endif

ulTotalTime *= configNUMBER_OF_CORES;

/* For percentage calculations. */
ulTotalTime /= ( configRUN_TIME_COUNTER_TYPE ) 100;

/* Avoid divide by zero errors. */
if( ulTotalTime > ( configRUN_TIME_COUNTER_TYPE ) 0 )
{
for( i = 0; i < ( BaseType_t ) configNUMBER_OF_CORES; i++ )
{
ulRunTimeCounter += xIdleTaskHandles[ i ]->ulRunTimeCounter;
}

ulRunTimeCounter = ulTaskGetIdleRunTimeCounter();
ulReturn = ulRunTimeCounter / ulTotalTime;
}
else
Expand Down
Loading