diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-03 07:02:03 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-17 08:27:47 +0100 |
commit | d37adfe5dd82cc3c933eb521b8f800c342af0e52 (patch) | |
tree | 5f4a77976b9ae35594d00b0bb58e18bb62a9b541 /cpukit/libmisc/cpuuse/cpuusagereport.c | |
parent | bsp/realview_pbx_a9_qemu: Fix compiler flags (diff) | |
download | rtems-d37adfe5dd82cc3c933eb521b8f800c342af0e52.tar.bz2 |
score: Fix CPU time used by executing threads
The CPU time used of a thread was previously maintained per-processor
mostly during _Thread_Dispatch(). However, on SMP configurations the
actual processor of a thread is difficult to figure out since thread
dispatching is a highly asynchronous process (e.g. via inter-processor
interrupts). Only the intended processor of a thread is known to the
scheduler easily. Do the CPU usage accounting during thread heir
updates in the context of the scheduler operations. Provide the
function _Thread_Get_CPU_time_used() to get the CPU usage of a thread
using proper locks to get a consistent value.
Close #2627.
Diffstat (limited to 'cpukit/libmisc/cpuuse/cpuusagereport.c')
-rw-r--r-- | cpukit/libmisc/cpuuse/cpuusagereport.c | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/cpukit/libmisc/cpuuse/cpuusagereport.c b/cpukit/libmisc/cpuuse/cpuusagereport.c index 98b5f8bfae..95d06480d6 100644 --- a/cpukit/libmisc/cpuuse/cpuusagereport.c +++ b/cpukit/libmisc/cpuuse/cpuusagereport.c @@ -44,7 +44,7 @@ void rtems_cpu_usage_report_with_plugin( Objects_Information *information; char name[13]; uint32_t ival, fval; - Timestamp_Control uptime, total, ran, uptime_at_last_reset; + Timestamp_Control uptime, total, used, uptime_at_last_reset; uint32_t seconds, nanoseconds; if ( !print ) @@ -90,38 +90,23 @@ void rtems_cpu_usage_report_with_plugin( name ); - { - Timestamp_Control last; - - /* - * If this is the currently executing thread, account for time - * since the last context switch. - */ - ran = the_thread->cpu_time_used; - if ( _Thread_Get_time_of_last_context_switch( the_thread, &last ) ) { - Timestamp_Control used; - _TOD_Get_uptime( &uptime ); - _Timestamp_Subtract( &last, &uptime, &used ); - _Timestamp_Add_to( &ran, &used ); - } else { - _TOD_Get_uptime( &uptime ); - } - _Timestamp_Subtract( &uptime_at_last_reset, &uptime, &total ); - _Timestamp_Divide( &ran, &total, &ival, &fval ); - - /* - * Print the information - */ - - seconds = _Timestamp_Get_seconds( &ran ); - nanoseconds = _Timestamp_Get_nanoseconds( &ran ) / - TOD_NANOSECONDS_PER_MICROSECOND; - (*print)( context, - "%7" PRIu32 ".%06" PRIu32 " |%4" PRIu32 ".%03" PRIu32 "\n", - seconds, nanoseconds, - ival, fval - ); - } + _Thread_Get_CPU_time_used( the_thread, &used ); + _TOD_Get_uptime( &uptime ); + _Timestamp_Subtract( &uptime_at_last_reset, &uptime, &total ); + _Timestamp_Divide( &used, &total, &ival, &fval ); + + /* + * Print the information + */ + + seconds = _Timestamp_Get_seconds( &used ); + nanoseconds = _Timestamp_Get_nanoseconds( &used ) / + TOD_NANOSECONDS_PER_MICROSECOND; + (*print)( context, + "%7" PRIu32 ".%06" PRIu32 " |%4" PRIu32 ".%03" PRIu32 "\n", + seconds, nanoseconds, + ival, fval + ); } } } |