summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--cpukit/ChangeLog8
-rw-r--r--cpukit/rtems/src/ratemonreportstatistics.c22
-rw-r--r--cpukit/rtems/src/regionresizesegment.c2
-rw-r--r--cpukit/rtems/src/tasksetnote.c3
4 files changed, 18 insertions, 17 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index e0f9c13108..3008457bc5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,13 @@
2009-10-04 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * rtems/src/ratemonreportstatistics.c: owner field is always set so
+ safe to use. Reformat.
+ * rtems/src/regionresizesegment.c: Always evaluate the blocked queue
+ if the resize succeeded.
+ * rtems/src/tasksetnote.c: Spacing.
+
+2009-10-04 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* posix/include/rtems/posix/psignal.h: Add extern for ualarm timer.
* posix/src/alarm.c, posix/src/ualarm.c: Change from switch to if since
many enumerated values have no action.
diff --git a/cpukit/rtems/src/ratemonreportstatistics.c b/cpukit/rtems/src/ratemonreportstatistics.c
index bd9bbed84c..59bb07c96f 100644
--- a/cpukit/rtems/src/ratemonreportstatistics.c
+++ b/cpukit/rtems/src/ratemonreportstatistics.c
@@ -54,12 +54,12 @@ void rtems_rate_monotonic_report_statistics_with_plugin(
return;
(*print)( context, "Period information by period\n" );
-#if defined(RTEMS_ENABLE_NANOSECOND_CPU_USAGE_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
+ #if defined(RTEMS_ENABLE_NANOSECOND_CPU_USAGE_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
/*
Layout by columns -- in memory of Hollerith :)
@@ -118,16 +118,11 @@ ididididid NNNN ccccc mmmmmm X
continue;
#endif
- name[ 0 ] = '\0';
-
- if ( the_status.owner ) {
- rtems_object_get_name( the_status.owner, sizeof(name), name );
- }
+ rtems_object_get_name( the_status.owner, sizeof(name), name );
/*
* Print part of report line that is not dependent on granularity
*/
-
(*print)( context,
"0x%08" PRIx32 " %4s %5" PRId32 " %6" PRId32 " ",
id, name,
@@ -137,7 +132,6 @@ ididididid NNNN ccccc mmmmmm X
/*
* If the count is zero, don't print statistics
*/
-
if (the_stats.count == 0) {
(*print)( context, "\n" );
continue;
@@ -180,7 +174,7 @@ ididididid NNNN ccccc mmmmmm X
}
/*
- * print Wall time part of statistics
+ * print wall time part of statistics
*/
{
#ifdef RTEMS_ENABLE_NANOSECOND_RATE_MONOTONIC_STATISTICS
diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index a2f64f5fb3..865c898b8f 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -80,7 +80,7 @@ rtems_status_code rtems_region_resize_segment(
_Region_Debug_Walk( the_region, 8 );
- if ( status == HEAP_RESIZE_SUCCESSFUL && avail_size > 0 )
+ if ( status == HEAP_RESIZE_SUCCESSFUL )
_Region_Process_queue( the_region ); /* unlocks allocator */
else
_RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/tasksetnote.c b/cpukit/rtems/src/tasksetnote.c
index ebb501998e..e104ba5069 100644
--- a/cpukit/rtems/src/tasksetnote.c
+++ b/cpukit/rtems/src/tasksetnote.c
@@ -1,8 +1,7 @@
/*
* RTEMS Task Manager
*
- *
- * COPYRIGHT (c) 1989-2007.
+ * COPYRIGHT (c) 1989-2009.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be