RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-03-07 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libmisc/cpuuse/cpuusagereport.c: Fix calculation in case a thread
	dispatch happends in the meantime.  The percent values will not sum up
	to one hundred percent.
This commit is contained in:
Sebastian Huber
2011-03-07 14:55:05 +00:00
parent babaedefa9
commit db498aba75
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cpukit/ChangeLog
View File

@@ -2,6 +2,9 @@
* include/rtems/irq-extension.h: Documentation. * include/rtems/irq-extension.h: Documentation.
* libmisc/monitor/mon-prmisc.c: Fix for multiprocessing configuration. * libmisc/monitor/mon-prmisc.c: Fix for multiprocessing configuration.
* libmisc/cpuuse/cpuusagereport.c: Fix calculation in case a thread
dispatch happends in the meantime. The percent values will not sum up
to one hundred percent.
2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org> 2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>

15
cpukit/libmisc/cpuuse/cpuusagereport.c
View File

@@ -53,7 +53,7 @@ void rtems_cpu_usage_report_with_plugin(
char name[13]; char name[13];
uint32_t ival, fval; uint32_t ival, fval;
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
Timestamp_Control uptime, total, ran, last_context_switch; Timestamp_Control uptime, total, ran, uptime_at_last_reset;
#else #else
uint32_t total_units = 0; uint32_t total_units = 0;
#endif #endif
@@ -67,9 +67,7 @@ void rtems_cpu_usage_report_with_plugin(
* guideline as to what each number means proportionally. * guideline as to what each number means proportionally.
*/ */
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
last_context_switch = _Thread_Time_of_last_context_switch; uptime_at_last_reset = CPU_usage_Uptime_at_last_reset;
_TOD_Get_uptime( &uptime );
_Timestamp_Subtract( &CPU_usage_Uptime_at_last_reset, &uptime, &total );
#else #else
for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ ) { for ( api_index = 1 ; api_index <= OBJECTS_APIS_LAST ; api_index++ ) {
#if !defined(RTEMS_POSIX_API) || defined(RTEMS_DEBUG) #if !defined(RTEMS_POSIX_API) || defined(RTEMS_DEBUG)
@@ -133,9 +131,14 @@ void rtems_cpu_usage_report_with_plugin(
ran = the_thread->cpu_time_used; ran = the_thread->cpu_time_used;
if ( _Thread_Executing->Object.id == the_thread->Object.id ) { if ( _Thread_Executing->Object.id == the_thread->Object.id ) {
Timestamp_Control used; Timestamp_Control used;
_Timestamp_Subtract( &last_context_switch, &uptime, &used ); Timestamp_Control last = _Thread_Time_of_last_context_switch;
_TOD_Get_uptime( &uptime );
_Timestamp_Subtract( &last, &uptime, &used );
_Timestamp_Add_to( &ran, &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 ); _Timestamp_Divide( &ran, &total, &ival, &fval );
/* /*