<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-09-15)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2919&r2=text&tr2=1.2920&diff_format=h">M</a></td><td width='1%'>1.2920</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/cpuuse/cpuusagedata.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>cpukit/libmisc/cpuuse/cpuusagedata.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/cpuuse/cpuusagereport.c.diff?r1=text&tr1=1.23&r2=text&tr2=1.24&diff_format=h">M</a></td><td width='1%'>1.24</td><td width='100%'>cpukit/libmisc/cpuuse/cpuusagereport.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/cpuuse/cpuusagereset.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>cpukit/libmisc/cpuuse/cpuusagereset.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/cpuuse/cpuuse.h.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>cpukit/libmisc/cpuuse/cpuuse.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2919 rtems/cpukit/ChangeLog:1.2920
--- rtems/cpukit/ChangeLog:1.2919 Wed Sep 14 09:16:56 2011
+++ rtems/cpukit/ChangeLog Thu Sep 15 09:34:19 2011
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+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.
+
</font> 2011-09-14 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1898/cpukit
<font color='#006600'>diff -u rtems/cpukit/libmisc/cpuuse/cpuusagedata.c:1.3 rtems/cpukit/libmisc/cpuuse/cpuusagedata.c:1.4
--- rtems/cpukit/libmisc/cpuuse/cpuusagedata.c:1.3 Wed Dec 2 12:22:18 2009
+++ rtems/cpukit/libmisc/cpuuse/cpuusagedata.c Thu Sep 15 09:34:20 2011
</font><font color='#997700'>@@ -15,14 +15,10 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <rtems.h>
</font> #include <rtems/cpuuse.h>
<font color='#880000'>-#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
- #include <rtems/score/timespec.h>
-#endif
</font>
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
<font color='#880000'>- struct timespec CPU_usage_Uptime_at_last_reset;
</font><font color='#000088'>+ Timestamp_Control CPU_usage_Uptime_at_last_reset;
</font> #else
uint32_t CPU_usage_Ticks_at_last_reset;
#endif
<font color='#006600'>diff -u rtems/cpukit/libmisc/cpuuse/cpuusagereport.c:1.23 rtems/cpukit/libmisc/cpuuse/cpuusagereport.c:1.24
--- rtems/cpukit/libmisc/cpuuse/cpuusagereport.c:1.23 Tue Jun 28 15:39:39 2011
+++ rtems/cpukit/libmisc/cpuuse/cpuusagereport.c Thu Sep 15 09:34:21 2011
</font><font color='#997700'>@@ -15,8 +15,6 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <rtems.h>
-
</font> #include <string.h>
#include <stdlib.h>
#include <stdio.h>
<font color='#997700'>@@ -24,17 +22,6 @@
</font> #include <inttypes.h>
#include <rtems/cpuuse.h>
<font color='#880000'>-#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
</font>
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
static bool is_executing_on_a_core(
<font color='#997700'>@@ -77,6 +64,7 @@
</font> uint32_t ival, fval;
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
Timestamp_Control uptime, total, ran, uptime_at_last_reset;
<font color='#000088'>+ uint32_t seconds, nanoseconds;
</font> #else
uint32_t total_units = 0;
#endif
<font color='#997700'>@@ -171,11 +159,12 @@
</font> * Print the information
*/
<font color='#000088'>+ seconds = _Timestamp_Get_seconds( &ran );
+ nanoseconds = _Timestamp_Get_nanoseconds( &ran ) /
+ TOD_NANOSECONDS_PER_MICROSECOND;
</font> (*print)( context,
"%7" PRIu32 ".%06" PRIu32 " |%4" PRIu32 ".%03" PRIu32 "\n",
<font color='#880000'>- _Timestamp_Get_seconds( &ran ),
- _Timestamp_Get_nanoseconds( &ran ) /
- TOD_NANOSECONDS_PER_MICROSECOND,
</font><font color='#000088'>+ seconds, nanoseconds,
</font> ival, fval
);
}
<font color='#997700'>@@ -204,13 +193,15 @@
</font> }
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
<font color='#000088'>+ seconds = _Timestamp_Get_seconds( &total );
+ nanoseconds = _Timestamp_Get_nanoseconds( &total ) /
+ TOD_NANOSECONDS_PER_MICROSECOND;
</font> (*print)(
context,
"------------+----------------------------------------+---------------+---------\n"
" TIME SINCE LAST CPU USAGE RESET IN SECONDS: %7" PRIu32 ".%06" PRIu32 "\n"
"-------------------------------------------------------------------------------\n",
<font color='#880000'>- _Timestamp_Get_seconds( &total ),
- _Timestamp_Get_nanoseconds( &total ) / TOD_NANOSECONDS_PER_MICROSECOND
</font><font color='#000088'>+ seconds, nanoseconds
</font> );
#else
(*print)(
<font color='#006600'>diff -u rtems/cpukit/libmisc/cpuuse/cpuusagereset.c:1.8 rtems/cpukit/libmisc/cpuuse/cpuusagereset.c:1.9
--- rtems/cpukit/libmisc/cpuuse/cpuusagereset.c:1.8 Wed Dec 2 12:22:18 2009
+++ rtems/cpukit/libmisc/cpuuse/cpuusagereset.c Thu Sep 15 09:34:21 2011
</font><font color='#997700'>@@ -15,9 +15,6 @@
</font> #include "config.h"
#endif
<font color='#880000'>-#include <rtems.h>
-#include <rtems/score/timestamp.h>
-
</font> #include <stdlib.h>
#include <ctype.h>
#include <inttypes.h>
<font color='#997700'>@@ -36,15 +33,6 @@
</font> }
/*
<font color='#880000'>- * 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
-
-/*
</font> * rtems_cpu_usage_reset
*/
void rtems_cpu_usage_reset( void )
<font color='#006600'>diff -u rtems/cpukit/libmisc/cpuuse/cpuuse.h:1.10 rtems/cpukit/libmisc/cpuuse/cpuuse.h:1.11
--- rtems/cpukit/libmisc/cpuuse/cpuuse.h:1.10 Fri Jun 24 12:52:56 2011
+++ rtems/cpukit/libmisc/cpuuse/cpuuse.h Thu Sep 15 09:34:21 2011
</font><font color='#997700'>@@ -19,12 +19,23 @@
</font> #ifndef __RTEMS_CPUUSE_h
#define __RTEMS_CPUUSE_h
<font color='#000088'>+#include <rtems.h>
</font> #include <rtems/bspIo.h>
<font color='#000088'>+#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+ #include <rtems/score/timestamp.h>
+#endif
+
</font> #ifdef __cplusplus
extern "C" {
#endif
<font color='#000088'>+#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
+
</font> /*
* rtems_cpu_usage_report_with_handler
*/
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>