Changeset baef6771 in rtems

Timestamp:

Sep 15, 2011, 2:34:21 PM (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

82db8e56

Parents:

e41cec3

Message:

2011-09-15 Sebastian Huber <sebastian.huber@…>

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

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libmisc/cpuuse/cpuusagedata.c (modified) (1 diff)
• libmisc/cpuuse/cpuusagereport.c (modified) (6 diffs)
• libmisc/cpuuse/cpuusagereset.c (modified) (2 diffs)
• libmisc/cpuuse/cpuuse.h (modified) (1 diff)

cpukit/ChangeLog

@@ +1 @@
+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>
 

cpukit/libmisc/cpuuse/cpuusagedata.c

@@ -16 +16 @@
 #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;

cpukit/libmisc/cpuuse/cpuusagereport.c

@@ -16 +16 @@
 #endif
 
-#include <rtems.h>
-
 #include <string.h>
 #include <stdlib.h>
@@ -25 +23 @@
 
 #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__
@@ -78 +65 @@
   #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;
@@ -172 +160 @@
            */
 
+          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
           );
@@ -205 +194 @@
 
   #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+    seconds = _Timestamp_Get_seconds( &total );
+    nanoseconds = _Timestamp_Get_nanoseconds( &total ) /
+      TOD_NANOSECONDS_PER_MICROSECOND;
     (*print)(
        context,
@@ -210 +202 @@
        " 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

cpukit/libmisc/cpuuse/cpuusagereset.c

@@ -15 +15 @@
 #include "config.h"
 #endif
-
-#include <rtems.h>
-#include <rtems/score/timestamp.h>
 
 #include <stdlib.h>
@@ -37 +34 @@
 
 /*
- * 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
  */

cpukit/libmisc/cpuuse/cpuuse.h

@@ -20 +20 @@
 #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