From 0221da5f56353c9b238ef51d5a24802ba67b8c56 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 12 Oct 2021 08:26:39 +0200 Subject: rtems: Fix rate monotonic statistics The rate monotonic period statistics were affected by rtems_cpu_usage_reset(). The logic to detect and work around a CPU usage reset was broken. The Thread_Contol::cpu_time_used is changed to contain the processor time used throughout the entire lifetime of the thread. The new member Thread_Contol::cpu_time_used_at_last_reset is added to contain the processor time used at the time of the last reset through rtems_cpu_usage_reset(). This decouples the resets of the CPU usage and the rate monotonic period statistics. Update #4528. --- cpukit/rtems/src/ratemonperiod.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'cpukit/rtems/src/ratemonperiod.c') diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c index 7f0d302583..32ac688a7f 100644 --- a/cpukit/rtems/src/ratemonperiod.c +++ b/cpukit/rtems/src/ratemonperiod.c @@ -26,7 +26,7 @@ #include #include -bool _Rate_monotonic_Get_status( +void _Rate_monotonic_Get_status( const Rate_monotonic_Control *the_period, Timestamp_Control *wall_since_last_period, Timestamp_Control *cpu_since_last_period @@ -47,14 +47,7 @@ bool _Rate_monotonic_Get_status( /* * Determine cpu usage since period initiated. */ - _Thread_Get_CPU_time_used( owning_thread, &used ); - - /* - * The cpu usage info was reset while executing. Can't - * determine a status. - */ - if ( _Timestamp_Less_than( &used, &the_period->cpu_usage_period_initiated ) ) - return false; + used = _Thread_Get_CPU_time_used( owning_thread ); /* used = current cpu usage - cpu usage at start of period */ _Timestamp_Subtract( @@ -62,8 +55,6 @@ bool _Rate_monotonic_Get_status( &used, cpu_since_last_period ); - - return true; } static void _Rate_monotonic_Release_postponed_job( @@ -130,7 +121,7 @@ void _Rate_monotonic_Restart( * Set the starting point and the CPU time used for the statistics. */ _TOD_Get_uptime( &the_period->time_period_initiated ); - _Thread_Get_CPU_time_used( owner, &the_period->cpu_usage_period_initiated ); + the_period->cpu_usage_period_initiated = _Thread_Get_CPU_time_used( owner ); _Rate_monotonic_Release_job( the_period, @@ -147,7 +138,6 @@ static void _Rate_monotonic_Update_statistics( Timestamp_Control executed; Timestamp_Control since_last_period; Rate_monotonic_Statistics *stats; - bool valid_status; /* * Assume we are only called in states where it is appropriate @@ -167,10 +157,7 @@ static void _Rate_monotonic_Update_statistics( /* * Grab status for time statistics. */ - valid_status = - _Rate_monotonic_Get_status( the_period, &since_last_period, &executed ); - if (!valid_status) - return; + _Rate_monotonic_Get_status( the_period, &since_last_period, &executed ); /* * Update CPU time -- cgit v1.2.3