summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-06-06 16:34:43 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-06-06 16:34:43 +0000
commitebfd9eaec6521f98c8c5547e6ea0a5f408f599d2 (patch)
treee3df69bf49ea2792ddf1e7a632b677248f64df24 /cpukit/rtems
parent2008-06-06 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-ebfd9eaec6521f98c8c5547e6ea0a5f408f599d2.tar.bz2
2008-06-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/include/rtems/rtems/ratemon.h, rtems/src/ratemonperiod.c, score/include/rtems/score/thread.h: Complete previous patch. Add typedef for cpu usage statistics.
Diffstat (limited to 'cpukit/rtems')
-rw-r--r--cpukit/rtems/include/rtems/rtems/ratemon.h11
-rw-r--r--cpukit/rtems/src/ratemonperiod.c8
2 files changed, 10 insertions, 9 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h
index 3f990f28bd..cccf40dd9f 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/cpukit/rtems/include/rtems/rtems/ratemon.h
@@ -104,9 +104,10 @@ typedef enum {
typedef struct {
uint32_t count;
uint32_t missed_count;
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE min_cpu_time;
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE max_cpu_time;
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE total_cpu_time;
+
+ rtems_thread_cpu_usage_t min_cpu_time;
+ rtems_thread_cpu_usage_t max_cpu_time;
+ rtems_thread_cpu_usage_t total_cpu_time;
rtems_rate_monotonic_period_time_t min_wall_time;
rtems_rate_monotonic_period_time_t max_wall_time;
@@ -120,7 +121,7 @@ typedef struct {
Objects_Id owner;
rtems_rate_monotonic_period_states state;
rtems_rate_monotonic_period_time_t since_last_period;
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE executed_since_last_period;
+ rtems_thread_cpu_usage_t executed_since_last_period;
} rtems_rate_monotonic_period_status;
/**
@@ -131,7 +132,7 @@ typedef struct {
Objects_Control Object;
Watchdog_Control Timer;
rtems_rate_monotonic_period_states state;
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE owner_executed_at_period;
+ rtems_thread_cpu_usage_t owner_executed_at_period;
rtems_rate_monotonic_period_time_t time_at_period;
uint32_t next_length;
Thread_Control *owner;
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index 3777b5ed76..5c9dfaed49 100644
--- a/cpukit/rtems/src/ratemonperiod.c
+++ b/cpukit/rtems/src/ratemonperiod.c
@@ -33,10 +33,10 @@ void _Rate_monotonic_Update_statistics(
)
{
rtems_rate_monotonic_period_statistics *stats;
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE executed;
- rtems_rate_monotonic_period_time_t since_last_period;
+ rtems_thread_cpu_usage_t executed;
+ rtems_rate_monotonic_period_time_t since_last_period;
#ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS
- rtems_rate_monotonic_period_time_t period_start;
+ rtems_rate_monotonic_period_time_t period_start;
#endif
#if defined(RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS) || \
defined(RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS)
@@ -234,7 +234,7 @@ rtems_status_code rtems_rate_monotonic_period(
#ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS
{
- RTEMS_CPU_USAGE_STATISTICS_TIME_TYPE ran;
+ rtems_thread_cpu_usage_t ran;
the_period->owner_executed_at_period =
_Thread_Executing->cpu_time_used;