diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-05-27 10:13:58 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2015-06-15 13:20:17 -0500 |
commit | e6b31b27fbe3cd76534db2d4fc4ef5dcdf0d33b4 (patch) | |
tree | e833cd29335dedfba764815c61a92c0a4cab1347 /cpukit/rtems/include/rtems/rtems | |
parent | score: Add _Watchdog_Preinitialize() (diff) | |
download | rtems-e6b31b27fbe3cd76534db2d4fc4ef5dcdf0d33b4.tar.bz2 |
Remove use ticks for statistics configure option.
This was obsolete and broken based upon recent time keeping changes.
Thie build option was previously enabled by adding
USE_TICKS_FOR_STATISTICS=1 to the configure command line.
This propagated into the code as preprocessor conditionals
using the __RTEMS_USE_TICKS_FOR_STATISTICS__ conditional.
Diffstat (limited to 'cpukit/rtems/include/rtems/rtems')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/ratemon.h | 16 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/ratemonimpl.h | 52 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/types.h | 6 |
3 files changed, 23 insertions, 51 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h index 8701639e12..3f8ed8bfad 100644 --- a/cpukit/rtems/include/rtems/rtems/ratemon.h +++ b/cpukit/rtems/include/rtems/rtems/ratemon.h @@ -62,25 +62,17 @@ extern "C" { * This is the public type used for the rate monotonic timing * statistics. */ -#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - #include <rtems/score/timespec.h> +#include <rtems/score/timespec.h> - typedef struct timespec rtems_rate_monotonic_period_time_t; -#else - typedef uint32_t rtems_rate_monotonic_period_time_t; -#endif +typedef struct timespec rtems_rate_monotonic_period_time_t; /** * This is the internal type used for the rate monotonic timing * statistics. */ -#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - #include <rtems/score/timestamp.h> +#include <rtems/score/timestamp.h> - typedef Timestamp_Control Rate_monotonic_Period_time_t; -#else - typedef uint32_t Rate_monotonic_Period_time_t; -#endif +typedef Timestamp_Control Rate_monotonic_Period_time_t; /** * The following enumerated type defines the states in which a diff --git a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h b/cpukit/rtems/include/rtems/rtems/ratemonimpl.h index 1489e57e06..b3aa1cf303 100644 --- a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h +++ b/cpukit/rtems/include/rtems/rtems/ratemonimpl.h @@ -201,46 +201,30 @@ void _Rate_monotonic_Initiate_statistics( * * This method resets the statistics information for a period instance. */ -#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - #define _Rate_monotonic_Reset_wall_time_statistics( _the_period ) \ - do { \ - /* set the minimums to a large value */ \ - _Timestamp_Set( \ - &(_the_period)->Statistics.min_wall_time, \ - 0x7fffffff, \ - 0x7fffffff \ - ); \ - } while (0) -#else - #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 +#define _Rate_monotonic_Reset_wall_time_statistics( _the_period ) \ + do { \ + /* set the minimums to a large value */ \ + _Timestamp_Set( \ + &(_the_period)->Statistics.min_wall_time, \ + 0x7fffffff, \ + 0x7fffffff \ + ); \ + } while (0) /** * @brief Rate_monotonic_Reset_cpu_use_statistics * * This helper method resets the period CPU usage statistics structure. */ -#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - #define _Rate_monotonic_Reset_cpu_use_statistics( _the_period ) \ - do { \ - /* set the minimums to a large value */ \ - _Timestamp_Set( \ - &(_the_period)->Statistics.min_cpu_time, \ - 0x7fffffff, \ - 0x7fffffff \ - ); \ - } while (0) -#else - #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 +#define _Rate_monotonic_Reset_cpu_use_statistics( _the_period ) \ + do { \ + /* set the minimums to a large value */ \ + _Timestamp_Set( \ + &(_the_period)->Statistics.min_cpu_time, \ + 0x7fffffff, \ + 0x7fffffff \ + ); \ + } while (0) /** * @brief Rate_monotonic_Reset_statistics diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h index fb88116769..978947615e 100644 --- a/cpukit/rtems/include/rtems/rtems/types.h +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -124,11 +124,7 @@ typedef Watchdog_Interval rtems_interval; * When using nanoseconds granularity timing, RTEMS may internally use a * variety of representations. */ -#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ - typedef struct timespec rtems_thread_cpu_usage_t; -#else - typedef uint32_t rtems_thread_cpu_usage_t; -#endif +typedef struct timespec rtems_thread_cpu_usage_t; /** * @brief Data structure to manage and manipulate calendar |