diff options
author | Glenn Humphrey <glenn.humphrey@oarcorp.com> | 2009-12-02 18:15:16 +0000 |
---|---|---|
committer | Glenn Humphrey <glenn.humphrey@oarcorp.com> | 2009-12-02 18:15:16 +0000 |
commit | c6f7e060eaeb951a86dc640855e88c6f8260a347 (patch) | |
tree | 7d6ef3b0be5fec6206861601980974b5749baa04 /cpukit/rtems/include/rtems | |
parent | 2009-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-c6f7e060eaeb951a86dc640855e88c6f8260a347.tar.bz2 |
2009-12-02 Glenn Humphrey <glenn.humphrey@OARcorp.com>
* configure.ac, libcsupport/src/__times.c,
libmisc/cpuuse/cpuusagedata.c, libmisc/cpuuse/cpuusagereport.c,
libmisc/cpuuse/cpuusagereset.c, rtems/include/rtems/rtems/ratemon.h,
rtems/include/rtems/rtems/types.h, rtems/src/ratemongetstatistics.c,
rtems/src/ratemongetstatus.c, rtems/src/ratemonperiod.c,
rtems/src/ratemonreportstatistics.c,
score/include/rtems/score/thread.h, score/src/threaddispatch.c,
score/src/threadinitialize.c, score/src/threadtickletimeslice.c:
Changed the configuration of statistics granularity to use just one
define.
Diffstat (limited to 'cpukit/rtems/include/rtems')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/ratemon.h | 22 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/types.h | 5 |
2 files changed, 6 insertions, 21 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h index 20cccc5d46..04f45d29a6 100644 --- a/cpukit/rtems/include/rtems/rtems/ratemon.h +++ b/cpukit/rtems/include/rtems/rtems/ratemon.h @@ -54,25 +54,11 @@ extern "C" { #endif -/* - * The user can define this at configure time and go back to ticks - * resolution. - */ -#if !defined(__RTEMS_USE_TICKS_RATE_MONOTONIC_STATISTICS__) - /** - * Enable the nanosecond accurate statistics - * - * When not defined, the older style tick accurate granularity - * is used. - */ - #define RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS -#endif - /** * This is the public type used for the rate monotonic timing * statistics. */ -#if defined(RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS) +#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ #include <rtems/score/timespec.h> typedef struct timespec rtems_rate_monotonic_period_time_t; @@ -84,7 +70,7 @@ extern "C" { * This is the internal type used for the rate monotonic timing * statistics. */ -#if defined(RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS) +#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ #include <rtems/score/timestamp.h> typedef Timestamp_Control Rate_monotonic_Period_time_t; @@ -435,7 +421,7 @@ void _Rate_monotonic_Initiate_statistics( * * This method resets the statistics information for a period instance. */ -#ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS +#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ #define _Rate_monotonic_Reset_wall_time_statistics( _the_period ) \ do { \ /* set the minimums to a large value */ \ @@ -458,7 +444,7 @@ void _Rate_monotonic_Initiate_statistics( * * This helper method resets the period CPU usage statistics structure. */ -#ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS +#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ #define _Rate_monotonic_Reset_cpu_use_statistics( _the_period ) \ do { \ /* set the minimums to a large value */ \ diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h index 4c867c5cf4..8d8e77fd9c 100644 --- a/cpukit/rtems/include/rtems/rtems/types.h +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -124,15 +124,14 @@ typedef Watchdog_Interval rtems_interval; * @brief Represents the CPU usage per thread. * * When using nano seconds granularity timing, RTEMS may internally use a - * variety of represenations. + * variety of representations. */ -#ifndef __RTEMS_USE_TICKS_CPU_USAGE_STATISTICS__ +#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ typedef struct timespec rtems_thread_cpu_usage_t; #else typedef uint32_t rtems_thread_cpu_usage_t; #endif - /** * @brief Data structure to manage and manipulate calendar time. */ |