2011-09-15 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* cpukit/libmisc/cpuuse/cpuuse.h,
	cpukit/libmisc/cpuuse/cpuusagedata.c,
	cpukit/libmisc/cpuuse/cpuusagereport.c,
	cpukit/libmisc/cpuuse/cpuusagereset.c: Fixed timestamp usage.

5 files changed, 28 insertions, 35 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index a6e3f33116..4e5423fb65 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-15	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* cpukit/libmisc/cpuuse/cpuuse.h,
+	cpukit/libmisc/cpuuse/cpuusagedata.c,
+	cpukit/libmisc/cpuuse/cpuusagereport.c,
+	cpukit/libmisc/cpuuse/cpuusagereset.c: Fixed timestamp usage.
+
 2011-09-14	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	PR 1898/cpukit
diff --git a/cpukit/libmisc/cpuuse/cpuusagedata.c b/cpukit/libmisc/cpuuse/cpuusagedata.c
index 2d74b7eadf..eb68c550b5 100644
--- a/cpukit/libmisc/cpuuse/cpuusagedata.c
+++ b/cpukit/libmisc/cpuuse/cpuusagedata.c
@@ -15,14 +15,10 @@
 #include "config.h"
 #endif
 
-#include <rtems.h>
 #include <rtems/cpuuse.h>
-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  #include <rtems/score/timespec.h>
-#endif
 
 #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  struct timespec    CPU_usage_Uptime_at_last_reset;
+  Timestamp_Control  CPU_usage_Uptime_at_last_reset;
 #else
   uint32_t           CPU_usage_Ticks_at_last_reset;
 #endif
diff --git a/cpukit/libmisc/cpuuse/cpuusagereport.c b/cpukit/libmisc/cpuuse/cpuusagereport.c
index a0696ff6eb..e60e2577ee 100644
--- a/cpukit/libmisc/cpuuse/cpuusagereport.c
+++ b/cpukit/libmisc/cpuuse/cpuusagereport.c
@@ -15,8 +15,6 @@
 #include "config.h"
 #endif
 
-#include <rtems.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,17 +22,6 @@
 #include <inttypes.h>
 
 #include <rtems/cpuuse.h>
-#include <rtems/bspIo.h>
-
-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  #include <rtems/score/timestamp.h>
-#endif
-
-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  extern Timestamp_Control  CPU_usage_Uptime_at_last_reset;
-#else
-  extern uint32_t           CPU_usage_Ticks_at_last_reset;
-#endif
 
 #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
   static bool is_executing_on_a_core(
@@ -77,6 +64,7 @@ void rtems_cpu_usage_report_with_plugin(
   uint32_t             ival, fval;
   #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
     Timestamp_Control  uptime, total, ran, uptime_at_last_reset;
+    uint32_t seconds, nanoseconds;
   #else
     uint32_t           total_units = 0;
   #endif
@@ -171,11 +159,12 @@ void rtems_cpu_usage_report_with_plugin(
            * Print the information
            */
 
+          seconds = _Timestamp_Get_seconds( &ran );
+          nanoseconds = _Timestamp_Get_nanoseconds( &ran ) /
+            TOD_NANOSECONDS_PER_MICROSECOND;
           (*print)( context,
             "%7" PRIu32 ".%06" PRIu32 " |%4" PRIu32 ".%03" PRIu32 "\n",
-            _Timestamp_Get_seconds( &ran ),
-            _Timestamp_Get_nanoseconds( &ran ) /
-               TOD_NANOSECONDS_PER_MICROSECOND,
+            seconds, nanoseconds,
             ival, fval
           );
         }
@@ -204,13 +193,15 @@ void rtems_cpu_usage_report_with_plugin(
   }
 
   #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+    seconds = _Timestamp_Get_seconds( &total );
+    nanoseconds = _Timestamp_Get_nanoseconds( &total ) /
+      TOD_NANOSECONDS_PER_MICROSECOND;
     (*print)(
        context,
        "------------+----------------------------------------+---------------+---------\n"
        " TIME SINCE LAST CPU USAGE RESET IN SECONDS:                    %7" PRIu32 ".%06" PRIu32 "\n"
        "-------------------------------------------------------------------------------\n",
-       _Timestamp_Get_seconds( &total ),
-       _Timestamp_Get_nanoseconds( &total ) / TOD_NANOSECONDS_PER_MICROSECOND
+       seconds, nanoseconds
     );
   #else
     (*print)(
diff --git a/cpukit/libmisc/cpuuse/cpuusagereset.c b/cpukit/libmisc/cpuuse/cpuusagereset.c
index 0bf46903f1..ef614d6381 100644
--- a/cpukit/libmisc/cpuuse/cpuusagereset.c
+++ b/cpukit/libmisc/cpuuse/cpuusagereset.c
@@ -15,9 +15,6 @@
 #include "config.h"
 #endif
 
-#include <rtems.h>
-#include <rtems/score/timestamp.h>
-
 #include <stdlib.h>
 #include <ctype.h>
 #include <inttypes.h>
@@ -36,15 +33,6 @@ static void CPU_usage_Per_thread_handler(
 }
 
 /*
- * External data that is shared by cpu usage code but not declared in .h files.
- */
-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
-  extern Timestamp_Control CPU_usage_Uptime_at_last_reset;
-#else
-  extern uint32_t   CPU_usage_Ticks_at_last_reset;
-#endif
-
-/*
  *  rtems_cpu_usage_reset
  */
 void rtems_cpu_usage_reset( void )
diff --git a/cpukit/libmisc/cpuuse/cpuuse.h b/cpukit/libmisc/cpuuse/cpuuse.h
index fd182aa21f..5497bacb29 100644
--- a/cpukit/libmisc/cpuuse/cpuuse.h
+++ b/cpukit/libmisc/cpuuse/cpuuse.h
@@ -19,12 +19,23 @@
 #ifndef __RTEMS_CPUUSE_h
 #define __RTEMS_CPUUSE_h
 
+#include <rtems.h>
 #include <rtems/bspIo.h>
 
+#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+  #include <rtems/score/timestamp.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+  extern Timestamp_Control  CPU_usage_Uptime_at_last_reset;
+#else
+  extern uint32_t           CPU_usage_Ticks_at_last_reset;
+#endif
+
 /*
  * rtems_cpu_usage_report_with_handler
  */