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/src/ratemonreportstatistics.c | |
| 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/src/ratemonreportstatistics.c')
| -rw-r--r-- | cpukit/rtems/src/ratemonreportstatistics.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/cpukit/rtems/src/ratemonreportstatistics.c b/cpukit/rtems/src/ratemonreportstatistics.c index 2aa5129bcc..791bb544ec 100644 --- a/cpukit/rtems/src/ratemonreportstatistics.c +++ b/cpukit/rtems/src/ratemonreportstatistics.c @@ -23,8 +23,7 @@ #include <rtems/bspIo.h> #include <rtems/score/timespec.h> -#if defined(RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS) || \ - defined(RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS) +#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ /* We print to 1/10's of milliseconds */ #define NANOSECONDS_DIVIDER 1000 #define PERCENT_FMT "%04" PRId32 @@ -54,10 +53,8 @@ void rtems_rate_monotonic_report_statistics_with_plugin( return; (*print)( context, "Period information by period\n" ); - #if defined(RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS) + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ (*print)( context, "--- CPU times are in seconds ---\n" ); - #endif - #if defined(RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS) (*print)( context, "--- Wall times are in seconds ---\n" ); #endif /* @@ -74,28 +71,22 @@ ididididid NNNN ccccc mmmmmm X \n"); */ (*print)( context, " ID OWNER COUNT MISSED " - #ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ " " #endif "CPU TIME " - #ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS - " " - #endif - #ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS - " " + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ + " " #endif " WALL TIME\n" ); (*print)( context, " " - #ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ " " #endif "MIN/MAX/AVG " - #ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS - " " - #endif - #ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS - " " + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ + " " #endif " MIN/MAX/AVG\n" ); @@ -141,7 +132,7 @@ ididididid NNNN ccccc mmmmmm X * print CPU Usage part of statistics */ { - #ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ struct timespec cpu_average; struct timespec *min_cpu = &the_stats.min_cpu_time; struct timespec *max_cpu = &the_stats.max_cpu_time; @@ -177,7 +168,7 @@ ididididid NNNN ccccc mmmmmm X * print wall time part of statistics */ { - #ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS + #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__ struct timespec wall_average; struct timespec *min_wall = &the_stats.min_wall_time; struct timespec *max_wall = &the_stats.max_wall_time; |