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

2009-11-10 Jennifer Averett <jennifer.averett@OARcorp.com>

Browse Source 
PR 1462/cpukit
	* rtems/include/rtems/rtems/ratemon.h, rtems/src/ratemonperiod.c: Fine
	tune previous patch after analysis in application.
This commit is contained in:
Joel Sherrill
2009-11-10 23:27:34 +00:00
parent b02f4cc11f
commit a91e372e9a
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2009-11-10 Jennifer Averett <jennifer.averett@OARcorp.com>
PR 1462/cpukit
* rtems/include/rtems/rtems/ratemon.h, rtems/src/ratemonperiod.c: Fine
tune previous patch after analysis in application.
2009-11-09 Joel Sherrill <joel.sherrill@oarcorp.com>
* libfs/src/dosfs/msdos_format.c: Rework to avoid overflow on 16-bit

12
cpukit/rtems/include/rtems/rtems/ratemon.h
View File

@@ -446,7 +446,11 @@ void _Rate_monotonic_Initiate_statistics(
); \
} while (0)
#else
#define _Rate_monotonic_Reset_wall_time_statistics( _the_period )
#define _Rate_monotonic_Reset_wall_time_statistics( _the_period ) \
do { \
/* set the minimum to a large value */ \
(_the_period)->Statistics.min_wall_time = 0xffffffff; \
} while (0)
#endif
/**
@@ -465,7 +469,11 @@ void _Rate_monotonic_Initiate_statistics(
); \
} while (0)
#else
#define _Rate_monotonic_Reset_cpu_use_statistics( _the_period )
#define _Rate_monotonic_Reset_cpu_use_statistics( _the_period ) \
do { \
/* set the minimum to a large value */ \
(_the_period)->Statistics.min_cpu_time = 0xffffffff; \
} while (0)
#endif
/**

21
cpukit/rtems/src/ratemonperiod.c
View File

@@ -104,7 +104,6 @@ void _Rate_monotonic_Update_statistics(
/*
* Update the counts.
*/
stats = &the_period->Statistics;
stats->count++;
@@ -114,15 +113,14 @@ void _Rate_monotonic_Update_statistics(
/*
* Grab basic information for time statistics.
*/
#ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS
_Timestamp_Subtract(
&the_period->time_at_period, &uptime, &since_last_period
_Timespec_Subtract(
&the_period->time_at_period,
&uptime,
&since_last_period
);
the_period->time_at_period = uptime;
#else
since_last_period = _Watchdog_Ticks_since_boot - the_period->time_at_period;
the_period->time_at_period = _Watchdog_Ticks_since_boot;
#endif
#ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS
@@ -150,6 +148,10 @@ void _Rate_monotonic_Update_statistics(
);
}
#else
/* partial period, cpu usage info reset while executing. Throw away */
if (the_period->owner->cpu_time_used <
the_period->owner_executed_at_period)
return;
executed = the_period->owner->cpu_time_used -
the_period->owner_executed_at_period;
#endif
@@ -181,6 +183,11 @@ void _Rate_monotonic_Update_statistics(
*/
#ifndef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS
/* Sanity check wall time */
if ( since_last_period < executed )
since_last_period = executed;
stats->total_wall_time += since_last_period;
if ( since_last_period < stats->min_wall_time )
@@ -323,7 +330,7 @@ rtems_status_code rtems_rate_monotonic_period(
/*
* Update statistics from the concluding period
*/
_Rate_monotonic_Update_statistics( the_period );
_Rate_monotonic_Initiate_statistics( the_period );
_ISR_Enable( level );