change log for rtems (2011-06-16)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu Jun 16 17:12:09 UTC 2011
*joel*:
2011-06-16 Joel Sherrill <joel.sherrill at oarcorp.com>
PR 1818/misc
* libmisc/cpuuse/cpuusagereport.c: Add SMP support to CPU Usage
Reporting.
M 1.2853 cpukit/ChangeLog
M 1.22 cpukit/libmisc/cpuuse/cpuusagereport.c
diff -u rtems/cpukit/ChangeLog:1.2852 rtems/cpukit/ChangeLog:1.2853
--- rtems/cpukit/ChangeLog:1.2852 Thu Jun 16 09:35:03 2011
+++ rtems/cpukit/ChangeLog Thu Jun 16 11:24:05 2011
@@ -1,3 +1,9 @@
+2011-06-16 Joel Sherrill <joel.sherrill at oarcorp.com>
+
+ PR 1818/misc
+ * libmisc/cpuuse/cpuusagereport.c: Add SMP support to CPU Usage
+ Reporting.
+
2011-06-16 Jennifer Averett <Jennifer Averett at OARcorp.com
* score/src/smp.c: Spinlock Name change necessary to resolve
diff -u rtems/cpukit/libmisc/cpuuse/cpuusagereport.c:1.21 rtems/cpukit/libmisc/cpuuse/cpuusagereport.c:1.22
--- rtems/cpukit/libmisc/cpuuse/cpuusagereport.c:1.21 Tue Mar 15 14:03:38 2011
+++ rtems/cpukit/libmisc/cpuuse/cpuusagereport.c Thu Jun 16 11:24:05 2011
@@ -36,11 +36,34 @@
extern uint32_t CPU_usage_Ticks_at_last_reset;
#endif
-/*PAGE
- *
+#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+ static bool is_executing_on_a_core(
+ Thread_Control *the_thread,
+ Timestamp_Control *time_of_context_switch
+ )
+ {
+ #ifndef RTEMS_SMP
+ if ( _Thread_Executing->Object.id == the_thread->Object.id ) {
+ *time_of_context_switch = _Thread_Time_of_last_context_switch;
+ return true;
+ }
+ #else
+ int cpu;
+ for ( cpu=0 ; cpu < _SMP_Processor_count ; cpu++ ) {
+ Per_CPU_Control *p = &_Per_CPU_Information[cpu];
+ if ( p->executing->Object.id == the_thread->Object.id ) {
+ *time_of_context_switch = p->time_of_last_context_switch;
+ return true;
+ }
+ }
+ #endif
+ return false;
+ }
+#endif
+
+/*
* rtems_cpu_usage_report
*/
-
void rtems_cpu_usage_report_with_plugin(
void *context,
rtems_printk_plugin_t print
@@ -125,14 +148,16 @@
);
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+ {
+ Timestamp_Control last;
+
/*
* If this is the currently executing thread, account for time
* since the last context switch.
*/
ran = the_thread->cpu_time_used;
- if ( _Thread_Executing->Object.id == the_thread->Object.id ) {
+ if ( is_executing_on_a_core( the_thread, &last ) ) {
Timestamp_Control used;
- Timestamp_Control last = _Thread_Time_of_last_context_switch;
_TOD_Get_uptime( &uptime );
_Timestamp_Subtract( &last, &uptime, &used );
_Timestamp_Add_to( &ran, &used );
@@ -153,6 +178,7 @@
TOD_NANOSECONDS_PER_MICROSECOND,
ival, fval
);
+ }
#else
if (total_units) {
uint64_t ival_64;
*ralf*:
2011-06-16 Ralf Corsépius <ralf.corsepius at rtems.org>
* startup/bspdelay.c: Fix broken CVS-Id.
M 1.168 c/src/lib/libbsp/sparc/erc32/ChangeLog
M 1.2 c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c
diff -u rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.167 rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.168
--- rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.167 Sat Jun 11 12:24:13 2011
+++ rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog Thu Jun 16 11:31:48 2011
@@ -1,3 +1,7 @@
+2011-06-16 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * startup/bspdelay.c: Fix broken CVS-Id.
+
2011-06-11 Joel Sherrill <joel.sherrill at oarcorp.com>
* Makefile.am, configure.ac: runtest for this BSP obsoleted by
diff -u rtems/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c:1.1 rtems/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c:1.2
--- rtems/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c:1.1 Mon May 23 12:41:30 2011
+++ rtems/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c Thu Jun 16 11:31:48 2011
@@ -8,7 +8,7 @@
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
- * $Id
+ * $Id$
*/
#include <bsp.h>
*ralf*:
2011-06-16 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.am: Don't generate host.cfg.in.
M 1.83 c/src/make/ChangeLog
M 1.26 c/src/make/Makefile.am
diff -u rtems/c/src/make/ChangeLog:1.82 rtems/c/src/make/ChangeLog:1.83
--- rtems/c/src/make/ChangeLog:1.82 Fri Apr 1 13:12:07 2011
+++ rtems/c/src/make/ChangeLog Thu Jun 16 11:49:22 2011
@@ -1,3 +1,7 @@
+2011-06-16 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * Makefile.am: Don't generate host.cfg.in.
+
2011-04-01 Joel Sherrill <joel.sherrill at oarcorp.com>
* Makefile.am, Makefile.inc.in, configure.ac, target.cfg.in: Update to
diff -u rtems/c/src/make/Makefile.am:1.25 rtems/c/src/make/Makefile.am:1.26
--- rtems/c/src/make/Makefile.am:1.25 Fri Apr 1 13:12:07 2011
+++ rtems/c/src/make/Makefile.am Thu Jun 16 11:49:22 2011
@@ -24,11 +24,6 @@
rtems_bsp_makedir = $(rtems_bspdir)/make
rtems_bsp_make_DATA = bsp.cfg target.cfg
-if MAINTAINER_MODE
-$(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in
- cp $< $@
-endif
-
bsp.cfg: bsp.cfg.in Makefile
sed \
-e "s|[@]HAS_MP[@]|$(HAS_MP)|" \
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110616/19b3ac3d/attachment.html>
More information about the vc
mailing list