<!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-06-17)</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>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1819/cpukit
* rtems/src/clocktick.c, score/Makefile.am,
score/include/rtems/score/scheduler.h,
score/include/rtems/score/schedulerpriority.h,
score/include/rtems/score/schedulersimple.h,
score/include/rtems/score/schedulersimplesmp.h,
score/include/rtems/score/thread.h,
score/inline/rtems/score/scheduler.inl: Add a scheduler entry point
which is invoked at each clock tick. _Thread_Tickle_timeslice() is
now a method owned by the Deterministic Priority Scheduler and shared
by the Simple Priority Scheduler. The Simple SMP Scheduler has its
own variation on this which does timeslicing bookkeeping on all
cores.
* score/src/schedulerprioritytick.c,
score/src/schedulersimplesmptick.c: New files.
* score/src/threadtickletimeslice.c: Removed.
</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.2854&r2=text&tr2=1.2855&diff_format=h">M</a></td><td width='1%'>1.2855</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/rtems/src/clocktick.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/rtems/src/clocktick.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/Makefile.am.diff?r1=text&tr1=1.103&r2=text&tr2=1.104&diff_format=h">M</a></td><td width='1%'>1.104</td><td width='100%'>cpukit/score/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/scheduler.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/score/include/rtems/score/scheduler.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/schedulerpriority.h.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>cpukit/score/include/rtems/score/schedulerpriority.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/schedulersimple.h.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/score/include/rtems/score/schedulersimple.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/schedulersimplesmp.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/score/include/rtems/score/schedulersimplesmp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/thread.h.diff?r1=text&tr1=1.105&r2=text&tr2=1.106&diff_format=h">M</a></td><td width='1%'>1.106</td><td width='100%'>cpukit/score/include/rtems/score/thread.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/inline/rtems/score/scheduler.inl.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/score/inline/rtems/score/scheduler.inl</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/schedulerprioritytick.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">cpukit/score/src/schedulerprioritytick.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/schedulersimplesmptick.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">cpukit/score/src/schedulersimplesmptick.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/threadtickletimeslice.c?rev=1.15&content-type=text/vnd.viewcvs-markup">R</a></td><td width='1%'><font color="#880000">1.15</font></td><td width='100%'><font color="#880000">cpukit/score/src/threadtickletimeslice.c</font></td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2854 rtems/cpukit/ChangeLog:1.2855
--- rtems/cpukit/ChangeLog:1.2854 Fri Jun 17 07:34:36 2011
+++ rtems/cpukit/ChangeLog Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -1,3 +1,22 @@
</font><font color='#000088'>+2011-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ PR 1819/cpukit
+ * rtems/src/clocktick.c, score/Makefile.am,
+ score/include/rtems/score/scheduler.h,
+ score/include/rtems/score/schedulerpriority.h,
+ score/include/rtems/score/schedulersimple.h,
+ score/include/rtems/score/schedulersimplesmp.h,
+ score/include/rtems/score/thread.h,
+ score/inline/rtems/score/scheduler.inl: Add a scheduler entry point
+ which is invoked at each clock tick. _Thread_Tickle_timeslice() is
+ now a method owned by the Deterministic Priority Scheduler and shared
+ by the Simple Priority Scheduler. The Simple SMP Scheduler has its
+ own variation on this which does timeslicing bookkeeping on all
+ cores.
+ * score/src/schedulerprioritytick.c,
+ score/src/schedulersimplesmptick.c: New files.
+ * score/src/threadtickletimeslice.c: Removed.
+
</font> 2011-06-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libcsupport/include/rtems/libio.h, cpukit/libcsupport/src/termios.c:
<font color='#006600'>diff -u rtems/cpukit/rtems/src/clocktick.c:1.4 rtems/cpukit/rtems/src/clocktick.c:1.5
--- rtems/cpukit/rtems/src/clocktick.c:1.4 Tue Jan 18 03:03:43 2005
+++ rtems/cpukit/rtems/src/clocktick.c Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -1,7 +1,5 @@
</font> /*
<font color='#880000'>- * Clock Manager
- *
- * COPYRIGHT (c) 1989-1999.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -45,7 +43,7 @@
</font>
_Watchdog_Tickle_ticks();
<font color='#880000'>- _Thread_Tickle_timeslice();
</font><font color='#000088'>+ _Scheduler_Tick();
</font>
if ( _Thread_Is_context_switch_necessary() &&
_Thread_Is_dispatching_enabled() )
<font color='#006600'>diff -u rtems/cpukit/score/Makefile.am:1.103 rtems/cpukit/score/Makefile.am:1.104
--- rtems/cpukit/score/Makefile.am:1.103 Mon May 23 08:30:14 2011
+++ rtems/cpukit/score/Makefile.am Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -134,7 +134,7 @@
</font> if HAS_SMP
libscore_a_SOURCES += src/smp.c src/smplock.c \
src/schedulersimplesmpblock.c src/schedulersimplesmpschedule.c \
<font color='#880000'>- src/schedulersimplesmpunblock.c
</font><font color='#000088'>+ src/schedulersimplesmpunblock.c src/schedulerprioritytick.c<span style="background-color: #FF0000"> </span>
</font> endif
## CORE_APIMUTEX_C_FILES
<font color='#997700'>@@ -196,6 +196,7 @@
</font> ## SCHEDULERPRIORITY_C_FILES
libscore_a_SOURCES += src/schedulerpriority.c \
src/schedulerpriorityallocate.c \
<font color='#000088'>+ src/schedulerprioritytick.c \
</font> src/schedulerpriorityblock.c \
src/schedulerpriorityenqueue.c \
src/schedulerpriorityenqueuefirst.c \
<font color='#997700'>@@ -239,8 +240,8 @@
</font> src/threadrestart.c src/threadsetpriority.c \
src/threadsetstate.c src/threadsettransient.c \
src/threadstackallocate.c src/threadstackfree.c src/threadstart.c \
<font color='#880000'>- src/threadstartmultitasking.c src/threadtickletimeslice.c \
- src/iterateoverthreads.c src/threadblockingoperationcancel.c
</font><font color='#000088'>+ src/threadstartmultitasking.c src/iterateoverthreads.c \
+ src/threadblockingoperationcancel.c
</font>
if HAS_SMP
libscore_a_SOURCES += src/threaddispatchdisablelevel.c
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/scheduler.h:1.5 rtems/cpukit/score/include/rtems/score/scheduler.h:1.6
--- rtems/cpukit/score/include/rtems/score/scheduler.h:1.5 Fri Feb 18 09:12:43 2011
+++ rtems/cpukit/score/include/rtems/score/scheduler.h Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -74,6 +74,9 @@
</font>
/** extract a thread from the ready set */
void ( *extract )(Thread_Control *);
<font color='#000088'>+
+ /** perform scheduler update actions required at each clock tick */
+ void ( *tick )(void);
</font> } Scheduler_Operations;
/**
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/schedulerpriority.h:1.9 rtems/cpukit/score/include/rtems/score/schedulerpriority.h:1.10
--- rtems/cpukit/score/include/rtems/score/schedulerpriority.h:1.9 Mon May 23 21:44:57 2011
+++ rtems/cpukit/score/include/rtems/score/schedulerpriority.h Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -48,7 +48,8 @@
</font> _Scheduler_priority_Update, /* update entry point */ \
_Scheduler_priority_Enqueue, /* enqueue entry point */ \
_Scheduler_priority_Enqueue_first, /* enqueue_first entry point */ \
<font color='#880000'>- _Scheduler_priority_Extract /* extract entry point */ \
</font><font color='#000088'>+ _Scheduler_priority_Extract, /* extract entry point */ \
+ _Scheduler_priority_Tick /* tick entry point */ \
</font> }
/**
<font color='#997700'>@@ -171,6 +172,15 @@
</font> );
/**
<font color='#000088'>+ * @brief Deterministic Priority Scheduler Tick Method
+ *
+ * This routine is invoked as part of processing each clock tick.
+ * It is responsible for determining if the current thread allows
+ * timeslicing and, if so, when its timeslice expires.
+ */
+void _Scheduler_priority_Tick( void );
+
+/**
</font> * This is the major bit map.
*/
extern volatile Priority_bit_map_Control _Priority_Major_bit_map;
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/schedulersimple.h:1.3 rtems/cpukit/score/include/rtems/score/schedulersimple.h:1.4
--- rtems/cpukit/score/include/rtems/score/schedulersimple.h:1.3 Mon May 23 21:44:57 2011
+++ rtems/cpukit/score/include/rtems/score/schedulersimple.h Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -28,6 +28,7 @@
</font> #endif
#include <rtems/score/scheduler.h>
<font color='#000088'>+#include <rtems/score/schedulerpriority.h>
</font>
/**
* Entry points for Scheduler Simple
<font color='#997700'>@@ -44,7 +45,8 @@
</font> _Scheduler_simple_Update, /* update entry point */ \
_Scheduler_simple_Enqueue, /* enqueue entry point */ \
_Scheduler_simple_Enqueue_first, /* enqueue_first entry point */ \
<font color='#880000'>- _Scheduler_simple_Extract /* extract entry point */ \
</font><font color='#000088'>+ _Scheduler_simple_Extract, /* extract entry point */ \
+ _Scheduler_priority_Tick /* tick entry point */ \
</font> }
/**
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/schedulersimplesmp.h:1.2 rtems/cpukit/score/include/rtems/score/schedulersimplesmp.h:1.3
--- rtems/cpukit/score/include/rtems/score/schedulersimplesmp.h:1.2 Mon May 23 21:44:57 2011
+++ rtems/cpukit/score/include/rtems/score/schedulersimplesmp.h Fri Jun 17 09:31:45 2011
</font><font color='#997700'>@@ -56,7 +56,8 @@
</font> _Scheduler_simple_Update, /* update entry point */ \
_Scheduler_simple_Enqueue, /* enqueue entry point */ \
_Scheduler_simple_Enqueue_first, /* enqueue_first entry point */ \
<font color='#880000'>- _Scheduler_simple_Extract /* extract entry point */ \
</font><font color='#000088'>+ _Scheduler_simple_Extract, /* extract entry point */ \
+ _Scheduler_simple_smp_Tick /* tick entry point */ \
</font> }
/**
<font color='#997700'>@@ -95,6 +96,16 @@
</font> Thread_Control *the_thread
);
<font color='#000088'>+/**
+ * @brief Scheduler Simple SMP Tick Method
+ *
+ * This routine is invoked as part of processing each clock tick.
+ * It is responsible for determining if the current thread allows
+ * timeslicing and, if so, when its timeslice expires.
+ */
+void _Scheduler_simple_smp_Tick( void );
+
+/**
</font> #ifdef __cplusplus
}
#endif
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/thread.h:1.105 rtems/cpukit/score/include/rtems/score/thread.h:1.106
--- rtems/cpukit/score/include/rtems/score/thread.h:1.105 Mon May 23 21:44:57 2011
+++ rtems/cpukit/score/include/rtems/score/thread.h Fri Jun 17 09:31:46 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2011.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -660,13 +660,6 @@
</font> );
/**
<font color='#880000'>- * This routine is invoked as part of processing each clock tick.
- * It is responsible for determining if the current thread allows
- * timeslicing and, if so, when its timeslice expires.
- */
-void _Thread_Tickle_timeslice( void );
-
-/**
</font> * This routine initializes the context of the_thread to its
* appropriate starting state.
*/
<font color='#006600'>diff -u rtems/cpukit/score/inline/rtems/score/scheduler.inl:1.4 rtems/cpukit/score/inline/rtems/score/scheduler.inl:1.5
--- rtems/cpukit/score/inline/rtems/score/scheduler.inl:1.4 Fri Feb 18 09:12:43 2011
+++ rtems/cpukit/score/inline/rtems/score/scheduler.inl Fri Jun 17 09:31:46 2011
</font><font color='#997700'>@@ -159,6 +159,18 @@
</font> _Scheduler.Operations.extract( the_thread );
}
<font color='#000088'>+/** @brief Scheduler Method Invoked at Each Clock Tick
+ *
+ * This method is invoked at each clock tick to allow the scheduler
+ * implementation to perform any activities required. For the<span style="background-color: #FF0000"> </span>
+ * scheduler which support standard RTEMS features, this includes
+ * time-slicing management.
+ */
+RTEMS_INLINE_ROUTINE void _Scheduler_Tick( void )
+{
+ _Scheduler.Operations.tick();
+}
+
</font> /**@}*/
#endif
<font color='#006600'>diff -u /dev/null rtems/cpukit/score/src/schedulerprioritytick.c:1.1
--- /dev/null Fri Jun 17 10:10:53 2011
+++ rtems/cpukit/score/src/schedulerprioritytick.c Fri Jun 17 09:31:46 2011
</font><font color='#997700'>@@ -0,0 +1,77 @@
</font><font color='#000088'>+/*
+ * COPYRIGHT (c) 1989-2009.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/schedulerpriority.h>
+
+void _Scheduler_priority_Tick( void )
+{
+ Thread_Control *executing;
+
+ executing = _Thread_Executing;
+
+ #ifdef __RTEMS_USE_TICKS_FOR_STATISTICS__
+ /*
+ * Increment the number of ticks this thread has been executing
+ */
+ executing->cpu_time_used++;
+ #endif
+
+ /*
+ * If the thread is not preemptible or is not ready, then
+ * just return.
+ */
+
+ if ( !executing->is_preemptible )
+ return;
+
+ if ( !_States_Is_ready( executing->current_state ) )
+ return;
+
+ /*
+ * The cpu budget algorithm determines what happens next.
+ */
+
+ switch ( executing->budget_algorithm ) {
+ case THREAD_CPU_BUDGET_ALGORITHM_NONE:
+ break;
+
+ case THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE:
+ #if defined(RTEMS_SCORE_THREAD_ENABLE_EXHAUST_TIMESLICE)
+ case THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE:
+ #endif
+ if ( (int)(--executing->cpu_time_budget) <= 0 ) {
+
+ /*
+ * A yield performs the ready chain mechanics needed when
+ * resetting a timeslice. If no other thread's are ready
+ * at the priority of the currently executing thread, then the
+ * executing thread's timeslice is reset. Otherwise, the
+ * currently executing thread is placed at the rear of the
+ * FIFO for this priority and a new heir is selected.
+ */
+ _Scheduler_Yield();
+ executing->cpu_time_budget = _Thread_Ticks_per_timeslice;
+ }
+ break;
+
+ #if defined(RTEMS_SCORE_THREAD_ENABLE_SCHEDULER_CALLOUT)
+ case THREAD_CPU_BUDGET_ALGORITHM_CALLOUT:
+ if ( --executing->cpu_time_budget == 0 )
+ (*executing->budget_callout)( executing );
+ break;
+ #endif
+ }
+}
</font>
<font color='#006600'>diff -u /dev/null rtems/cpukit/score/src/schedulersimplesmptick.c:1.1
--- /dev/null Fri Jun 17 10:10:54 2011
+++ rtems/cpukit/score/src/schedulersimplesmptick.c Fri Jun 17 09:31:46 2011
</font><font color='#997700'>@@ -0,0 +1,100 @@
</font><font color='#000088'>+/*
+ * COPYRIGHT (c) 1989-2009.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/schedulersimplesmp.h>
+
+static void _Scheduler_simple_smp_Tick_helper(
+ int cpu
+)
+{
+ Thread_Control *executing;
+
+ executing = _Per_CPU_Information[cpu].executing;
+
+ #ifdef __RTEMS_USE_TICKS_FOR_STATISTICS__
+ /*
+ * Increment the number of ticks this thread has been executing
+ */
+ executing->cpu_time_used++;
+ #endif
+
+ /*
+ * If the thread is not preemptible or is not ready, then
+ * just return.
+ */
+
+ if ( !executing->is_preemptible )
+ return;
+
+ if ( !_States_Is_ready( executing->current_state ) )
+ return;
+
+ /*
+ * The cpu budget algorithm determines what happens next.
+ */
+
+ switch ( executing->budget_algorithm ) {
+ case THREAD_CPU_BUDGET_ALGORITHM_NONE:
+ break;
+
+ case THREAD_CPU_BUDGET_ALGORITHM_RESET_TIMESLICE:
+ #if defined(RTEMS_SCORE_THREAD_ENABLE_EXHAUST_TIMESLICE)
+ case THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE:
+ #endif
+ if ( (int)(--executing->cpu_time_budget) <= 0 ) {
+
+ /*
+ * A yield performs the ready chain mechanics needed when
+ * resetting a timeslice. If no other thread's are ready
+ * at the priority of the currently executing thread, then the
+ * executing thread's timeslice is reset. Otherwise, the
+ * currently executing thread is placed at the rear of the
+ * FIFO for this priority and a new heir is selected.
+ *
+ * In the SMP case, we do the chain manipulation for every
+ * CPU, then schedule after all CPUs have been evaluated.
+ */
+ _ISR_Disable( level );
+ _Scheduler_simple_Ready_queue_requeue( &_Scheduler, executing );
+ _ISR_Enable( level );
+
+ executing->cpu_time_budget = _Thread_Ticks_per_timeslice;
+ }
+ break;
+
+ #if defined(RTEMS_SCORE_THREAD_ENABLE_SCHEDULER_CALLOUT)
+ case THREAD_CPU_BUDGET_ALGORITHM_CALLOUT:
+ if ( --executing->cpu_time_budget == 0 )
+ (*executing->budget_callout)( executing );
+ break;
+ #endif
+ }
+}
+
+void _Scheduler_simple_smp_Tick( void )
+{
+ uint32_t cpu;
+
+ /*
+ * Iterate over all cores, updating time slicing information
+ * and logically performing a yield. Then perform a schedule
+ * operation to account for all the changes.
+ */
+ for ( cpu=0 ; cpu < _SMP_Processor_count ; cpu++ ) {
+ _Scheduler_simple_smp_Tick_helper( cpu );
+ }
+ _Scheduler_simple_smp_Schedule();
+}
</font></pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/include/rtems/malloc.h, libmisc/stackchk/stackchk.h,
posix/include/rtems/posix/time.h, rtems/include/rtems/rtems/object.h,
score/include/rtems/score/apiext.h,
score/include/rtems/score/interr.h, score/include/rtems/score/mpci.h,
score/include/rtems/score/objectmp.h,
score/include/rtems/score/thread.h,
score/include/rtems/score/threadmp.h,
score/include/rtems/score/threadq.h,
score/include/rtems/score/timespec.h,
score/include/rtems/score/timestamp.h,
score/include/rtems/score/timestamp64.h,
score/include/rtems/score/tod.h,
score/include/rtems/score/watchdog.h,
score/include/rtems/score/wkspace.h: Make @brief formatting more
consistent.
* score/include/rtems/score/rbtree.h: Also reformat.
</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.2855&r2=text&tr2=1.2856&diff_format=h">M</a></td><td width='1%'>1.2856</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libcsupport/include/rtems/malloc.h.diff?r1=text&tr1=1.12&r2=text&tr2=1.13&diff_format=h">M</a></td><td width='1%'>1.13</td><td width='100%'>cpukit/libcsupport/include/rtems/malloc.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/stackchk/stackchk.h.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>cpukit/libmisc/stackchk/stackchk.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/posix/include/rtems/posix/time.h.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>cpukit/posix/include/rtems/posix/time.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/rtems/include/rtems/rtems/object.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/rtems/include/rtems/rtems/object.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/apiext.h.diff?r1=text&tr1=1.19&r2=text&tr2=1.20&diff_format=h">M</a></td><td width='1%'>1.20</td><td width='100%'>cpukit/score/include/rtems/score/apiext.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/interr.h.diff?r1=text&tr1=1.33&r2=text&tr2=1.34&diff_format=h">M</a></td><td width='1%'>1.34</td><td width='100%'>cpukit/score/include/rtems/score/interr.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/mpci.h.diff?r1=text&tr1=1.27&r2=text&tr2=1.28&diff_format=h">M</a></td><td width='1%'>1.28</td><td width='100%'>cpukit/score/include/rtems/score/mpci.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/objectmp.h.diff?r1=text&tr1=1.28&r2=text&tr2=1.29&diff_format=h">M</a></td><td width='1%'>1.29</td><td width='100%'>cpukit/score/include/rtems/score/objectmp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/rbtree.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/score/include/rtems/score/rbtree.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/thread.h.diff?r1=text&tr1=1.106&r2=text&tr2=1.107&diff_format=h">M</a></td><td width='1%'>1.107</td><td width='100%'>cpukit/score/include/rtems/score/thread.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/threadmp.h.diff?r1=text&tr1=1.20&r2=text&tr2=1.21&diff_format=h">M</a></td><td width='1%'>1.21</td><td width='100%'>cpukit/score/include/rtems/score/threadmp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/threadq.h.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>cpukit/score/include/rtems/score/threadq.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/timespec.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/score/include/rtems/score/timespec.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/timestamp.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/score/include/rtems/score/timestamp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/timestamp64.h.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/score/include/rtems/score/timestamp64.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/tod.h.diff?r1=text&tr1=1.41&r2=text&tr2=1.42&diff_format=h">M</a></td><td width='1%'>1.42</td><td width='100%'>cpukit/score/include/rtems/score/tod.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/watchdog.h.diff?r1=text&tr1=1.31&r2=text&tr2=1.32&diff_format=h">M</a></td><td width='1%'>1.32</td><td width='100%'>cpukit/score/include/rtems/score/watchdog.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/include/rtems/score/wkspace.h.diff?r1=text&tr1=1.31&r2=text&tr2=1.32&diff_format=h">M</a></td><td width='1%'>1.32</td><td width='100%'>cpukit/score/include/rtems/score/wkspace.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2855 rtems/cpukit/ChangeLog:1.2856
--- rtems/cpukit/ChangeLog:1.2855 Fri Jun 17 09:31:45 2011
+++ rtems/cpukit/ChangeLog Fri Jun 17 09:55:26 2011
</font><font color='#997700'>@@ -1,5 +1,24 @@
</font> 2011-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
<font color='#000088'>+ * libcsupport/include/rtems/malloc.h, libmisc/stackchk/stackchk.h,
+ posix/include/rtems/posix/time.h, rtems/include/rtems/rtems/object.h,
+ score/include/rtems/score/apiext.h,
+ score/include/rtems/score/interr.h, score/include/rtems/score/mpci.h,
+ score/include/rtems/score/objectmp.h,
+ score/include/rtems/score/thread.h,
+ score/include/rtems/score/threadmp.h,
+ score/include/rtems/score/threadq.h,
+ score/include/rtems/score/timespec.h,
+ score/include/rtems/score/timestamp.h,
+ score/include/rtems/score/timestamp64.h,
+ score/include/rtems/score/tod.h,
+ score/include/rtems/score/watchdog.h,
+ score/include/rtems/score/wkspace.h: Make @brief formatting more
+ consistent.
+ * score/include/rtems/score/rbtree.h: Also reformat.
+
+2011-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
+
</font> PR 1819/cpukit
* rtems/src/clocktick.c, score/Makefile.am,
score/include/rtems/score/scheduler.h,
<font color='#006600'>diff -u rtems/cpukit/libcsupport/include/rtems/malloc.h:1.12 rtems/cpukit/libcsupport/include/rtems/malloc.h:1.13
--- rtems/cpukit/libcsupport/include/rtems/malloc.h:1.12 Thu Feb 17 08:17:09 2011
+++ rtems/cpukit/libcsupport/include/rtems/malloc.h Fri Jun 17 09:55:26 2011
</font><font color='#997700'>@@ -5,7 +5,7 @@
</font> /*
* RTEMS Malloc Extensions
*
<font color='#880000'>- * COPYRIGHT (c) 1989-2007.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may in
<font color='#997700'>@@ -72,7 +72,8 @@
</font> typedef void (*rtems_malloc_dirtier_t)(void *, size_t);
extern rtems_malloc_dirtier_t rtems_malloc_dirty_helper;
<font color='#880000'>-/** @brief Dirty memory function
</font><font color='#000088'>+/**
+ * @brief Dirty memory function
</font> *
* This method fills the specified area with a non-zero pattern
* to aid in debugging programs which do not initialize their
<font color='#997700'>@@ -83,7 +84,8 @@
</font> size_t size
);
<font color='#880000'>-/** @brief Print Malloc Statistic Usage Report
</font><font color='#000088'>+/**
+ * @brief Print Malloc Statistic Usage Report
</font> *
* This method fills in the called provided malloc statistics area.
*
<font color='#997700'>@@ -93,7 +95,8 @@
</font> rtems_malloc_statistics_t *stats
);
<font color='#880000'>-/** @brief Print Malloc Statistic Usage Report
</font><font color='#000088'>+/**
+ * @brief Print Malloc Statistic Usage Report
</font> *
* This method prints a malloc statistics report.
*
<font color='#997700'>@@ -101,7 +104,8 @@
</font> */
void malloc_report_statistics(void);
<font color='#880000'>-/** @brief Print Malloc Statistic Usage Report
</font><font color='#000088'>+/**
+ * @brief Print Malloc Statistic Usage Report
</font> *
* This method prints a malloc statistics report.
*
<font color='#997700'>@@ -116,6 +120,7 @@
</font> );
/**
<font color='#000088'>+ * @brief RTEMS variation on Aligned Memory Allocation
</font> *
* This method is a help memalign implementation which does all
* error checking done by posix_memalign() EXCEPT it does NOT
<font color='#006600'>diff -u rtems/cpukit/libmisc/stackchk/stackchk.h:1.17 rtems/cpukit/libmisc/stackchk/stackchk.h:1.18
--- rtems/cpukit/libmisc/stackchk/stackchk.h:1.17 Wed Feb 23 08:07:40 2011
+++ rtems/cpukit/libmisc/stackchk/stackchk.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -5,7 +5,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2007.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -27,7 +27,8 @@
</font> extern "C" {
#endif
<font color='#880000'>-/** @brief Has Current Task Blown Its Stack
</font><font color='#000088'>+/**
+ * @brief Has Current Task Blown Its Stack
</font> *
* This method is used to determine if the current stack pointer
* of the currently executing task is within bounds.
<font color='#997700'>@@ -38,7 +39,8 @@
</font> */
bool rtems_stack_checker_is_blown( void );
<font color='#880000'>-/** @brief Print Stack Usage Report
</font><font color='#000088'>+/**
+ * @brief Print Stack Usage Report
</font> *
* This method prints a stack usage report for the curently executing
* task.
<font color='#997700'>@@ -47,7 +49,8 @@
</font> */
void rtems_stack_checker_report_usage( void );
<font color='#880000'>-/** @brief Print Stack Usage Report
</font><font color='#000088'>+/**
+ * @brief Print Stack Usage Report
</font> *
* This method prints a stack usage report for the curently executing
* task.
<font color='#997700'>@@ -68,7 +71,8 @@
</font> *************************************************************
*************************************************************/
<font color='#880000'>-/** @brief Stack Checker Task Create Extension
</font><font color='#000088'>+/**
+ * @brief Stack Checker Task Create Extension
</font> *
* This method is the task create extension for the stack checker.
*
<font color='#997700'>@@ -83,7 +87,8 @@
</font> Thread_Control *the_thread
);
<font color='#880000'>-/** @brief Stack Checker Task Begin Extension
</font><font color='#000088'>+/**
+ * @brief Stack Checker Task Begin Extension
</font> *
* This method is the task begin extension for the stack checker.
*
<font color='#997700'>@@ -95,7 +100,8 @@
</font> Thread_Control *the_thread
);
<font color='#880000'>-/** @brief Stack Checker Task Context Switch Extension
</font><font color='#000088'>+/**
+ * @brief Stack Checker Task Context Switch Extension
</font> *
* This method is the task context switch extension for the stack checker.
*
<font color='#997700'>@@ -110,7 +116,8 @@
</font> Thread_Control *heir
);
<font color='#880000'>-/** @brief Stack Checker Extension Set Definition
</font><font color='#000088'>+/**
+ * @brief Stack Checker Extension Set Definition
</font> *
* This macro defines the user extension handler set for the stack
* checker. This macro is normally only used by confdefs.h.
<font color='#006600'>diff -u rtems/cpukit/posix/include/rtems/posix/time.h:1.14 rtems/cpukit/posix/include/rtems/posix/time.h:1.15
--- rtems/cpukit/posix/include/rtems/posix/time.h:1.14 Mon Nov 30 09:44:20 2009
+++ rtems/cpukit/posix/include/rtems/posix/time.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -3,7 +3,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -19,7 +19,8 @@
</font> #include <rtems/score/timespec.h>
#include <rtems/score/watchdog.h>
<font color='#880000'>-/** @brief Absolute Timeout Conversion Results
</font><font color='#000088'>+/**
+ * @brief Absolute Timeout Conversion Results
</font> *
* This enumeration defines the possible results of converting
* an absolute time used for timeouts to POSIX blocking calls to
<font color='#006600'>diff -u rtems/cpukit/rtems/include/rtems/rtems/object.h:1.10 rtems/cpukit/rtems/include/rtems/rtems/object.h:1.11
--- rtems/cpukit/rtems/include/rtems/rtems/object.h:1.10 Fri Jun 18 00:28:04 2010
+++ rtems/cpukit/rtems/include/rtems/rtems/object.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -2,7 +2,7 @@
</font> * @file rtems/rtems/object.h
*/
<font color='#880000'>-/* COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+/* COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -88,7 +88,8 @@
</font> #define rtems_build_name( _C1, _C2, _C3, _C4 ) \
_Objects_Build_name( _C1, _C2, _C3, _C4 )
<font color='#880000'>-/** @brief Obtain name of object
</font><font color='#000088'>+/**
+ * @brief Obtain name of object
</font> *
* This directive returns the name associated with the specified
* object ID.
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/apiext.h:1.19 rtems/cpukit/score/include/rtems/score/apiext.h:1.20
--- rtems/cpukit/score/include/rtems/score/apiext.h:1.19 Fri Jul 3 15:25:35 2009
+++ rtems/cpukit/score/include/rtems/score/apiext.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -91,13 +91,15 @@
</font> */
SCORE_EXTERN Chain_Control _API_extensions_List;
<font color='#880000'>-/** @brief Initialize the API Extensions Handler
</font><font color='#000088'>+/**
+ * @brief Initialize the API Extensions Handler
</font> *
* This routine initializes the API extension handler.
*/
void _API_extensions_Initialization( void );
<font color='#880000'>-/** @brief Add Extension Set to the Active Set
</font><font color='#000088'>+/**
+ * @brief Add Extension Set to the Active Set
</font> *
* This routine adds an extension to the active set of API extensions.
*
<font color='#997700'>@@ -108,20 +110,23 @@
</font> );
#if defined(FUNCTIONALITY_NOT_CURRENTLY_USED_BY_ANY_API)
<font color='#880000'>- /** @brief Execute all Pre-Driver Extensions
</font><font color='#000088'>+ /**
+ * @brief Execute all Pre-Driver Extensions
</font> *
* This routine executes all of the predriver callouts.
*/
void _API_extensions_Run_predriver( void );
#endif
<font color='#880000'>-/** @brief Execute all Post-Driver Extensions
</font><font color='#000088'>+/**
+ * @brief Execute all Post-Driver Extensions
</font> *
* This routine executes all of the postdriver callouts.
*/
void _API_extensions_Run_postdriver( void );
<font color='#880000'>-/** @brief Execute all Post Context Switch Extensions
</font><font color='#000088'>+/**
+ * @brief Execute all Post Context Switch Extensions
</font> *
* This routine executes all of the post context switch callouts.
*/
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/interr.h:1.33 rtems/cpukit/score/include/rtems/score/interr.h:1.34
--- rtems/cpukit/score/include/rtems/score/interr.h:1.33 Mon Aug 23 02:59:38 2010
+++ rtems/cpukit/score/include/rtems/score/interr.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2007.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -94,7 +94,8 @@
</font> */
SCORE_EXTERN Internal_errors_Information _Internal_errors_What_happened;
<font color='#880000'>-/** @brief Internal error Occurred
</font><font color='#000088'>+/**
+ * @brief Internal error Occurred
</font> *
* This routine is invoked when the application or the executive itself
* determines that a fatal error has occurred.
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/mpci.h:1.27 rtems/cpukit/score/include/rtems/score/mpci.h:1.28
--- rtems/cpukit/score/include/rtems/score/mpci.h:1.27 Fri Nov 27 23:58:54 2009
+++ rtems/cpukit/score/include/rtems/score/mpci.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -179,7 +179,8 @@
</font> */
SCORE_EXTERN MPCI_Control *_MPCI_table;
<font color='#880000'>-/** @brief Pointer to MP Thread Control Block
</font><font color='#000088'>+/**
+ * @brief Pointer to MP Thread Control Block
</font> *
* The following is used to determine when the multiprocessing receive
* thread is executing so that a proxy can be allocated instead of
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/objectmp.h:1.28 rtems/cpukit/score/include/rtems/score/objectmp.h:1.29
--- rtems/cpukit/score/include/rtems/score/objectmp.h:1.28 Fri Nov 27 23:58:54 2009
+++ rtems/cpukit/score/include/rtems/score/objectmp.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2006.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -46,21 +46,24 @@
</font> uint32_t name;
} Objects_MP_Control;
<font color='#880000'>-/** @brief Objects MP Handler initialization
</font><font color='#000088'>+/**
+ * @brief Objects MP Handler initialization
</font> *
* This routine intializes the inactive global object chain
* based on the maximum number of global objects configured.
*/
void _Objects_MP_Handler_initialization(void);
<font color='#880000'>-/** @brief Objects MP Handler Early initialization
</font><font color='#000088'>+/**
+ * @brief Objects MP Handler Early initialization
</font> *
* This routine intializes the global object node number
* used in the ID field of all objects.
*/
void _Objects_MP_Handler_early_initialization(void);
<font color='#880000'>-/** @brief Objects MP Open
</font><font color='#000088'>+/**
+ * @brief Objects MP Open
</font> *
* This routine place the specified global object in the
* specified information table.
<font color='#997700'>@@ -81,7 +84,8 @@
</font> Objects_Id the_id
);
<font color='#880000'>-/** @brief Objects MP Allocate and open
</font><font color='#000088'>+/**
+ * @brief Objects MP Allocate and open
</font> *
* This routine allocates a global object control block
* and places it in the specified information table. If the
<font color='#997700'>@@ -105,7 +109,8 @@
</font> bool is_fatal_error
);
<font color='#880000'>-/** @brief Objects MP Close
</font><font color='#000088'>+/**
+ * @brief Objects MP Close
</font> *
* This routine removes a global object from the specified
* information table and deallocates the global object control block.
<font color='#997700'>@@ -115,7 +120,8 @@
</font> Objects_Id the_id
);
<font color='#880000'>-/** @brief Objects MP Global name search
</font><font color='#000088'>+/**
+ * @brief Objects MP Global name search
</font> *
* This routine looks for the object with the_name in the global
* object tables indicated by information. It returns the ID of the
<font color='#997700'>@@ -138,7 +144,8 @@
</font> Objects_Id *the_id
);
<font color='#880000'>-/** @brief Objects MP Is remote
</font><font color='#000088'>+/**
+ * @brief Objects MP Is remote
</font> *
* This function searches the Global Object Table managed
* by information for the object indicated by ID. If the object
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/rbtree.h:1.2 rtems/cpukit/score/include/rtems/score/rbtree.h:1.3
--- rtems/cpukit/score/include/rtems/score/rbtree.h:1.2 Mon May 23 21:44:57 2011
+++ rtems/cpukit/score/include/rtems/score/rbtree.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -1,4 +1,3 @@
</font><font color='#880000'>-
</font> /**
* @file rtems/score/rbtree.h
*
<font color='#997700'>@@ -36,260 +35,260 @@
</font>
#include <rtems/score/address.h>
<font color='#880000'>- /**
- * @typedef RBTree_Node
- *
- * This type definition promotes the name for the RBTree Node used by
- * all RTEMS code. It is a separate type definition because a forward
- * reference is required to define it. See @ref RBTree_Node_struct for
- * detailed information.
- */
- typedef struct RBTree_Node_struct RBTree_Node;
-
- /**
- * This enum type defines the colors available for the RBTree Nodes
- */
- typedef enum {
- RBT_BLACK,
- RBT_RED
- } RBTree_Color;
-
- /**
- * @struct RBTree_Node_struct
- *
- * This is used to manage each element (node) which is placed
- * on a RBT.
- *
- * @note Typically, a more complicated structure will use the
- * rbtree package. The more complicated structure will
- * include a rbtree node as the first element in its
- * control structure. It will then call the rbtree package
- * with a pointer to that node element. The node pointer
- * and the higher level structure start at the same address
- * so the user can cast the pointers back and forth.
- *
- */
- struct RBTree_Node_struct {
- /** This points to the node's parent */
- RBTree_Node *parent;
- /** child[0] points to the left child, child[1] points to the right child */
- RBTree_Node *child[2];
- /** This is the integer value stored by this node, used for sorting */
- unsigned int value;
- /** The color of the node. Either red or black */
- RBTree_Color color;
- };
-
- /**
- * @brief macro to return the structure containing the @a node.
- *
- * This macro returns a pointer of type @a container_type that points
- * to the structure containing @a node, where @a node_field_name is the
- * field name of the RBTree_Node structure in @a container_type.
- *
- */
</font><font color='#000088'>+/**
+ * @typedef RBTree_Node
+ *
+ * This type definition promotes the name for the RBTree Node used by
+ * all RTEMS code. It is a separate type definition because a forward
+ * reference is required to define it. See @ref RBTree_Node_struct for
+ * detailed information.
+ */
+typedef struct RBTree_Node_struct RBTree_Node;
+
+/**
+ * This enum type defines the colors available for the RBTree Nodes
+ */
+typedef enum {
+ RBT_BLACK,
+ RBT_RED
+} RBTree_Color;
+
+/**
+ * @struct RBTree_Node_struct
+ *
+ * This is used to manage each element (node) which is placed
+ * on a RBT.
+ *
+ * @note Typically, a more complicated structure will use the
+ * rbtree package. The more complicated structure will
+ * include a rbtree node as the first element in its
+ * control structure. It will then call the rbtree package
+ * with a pointer to that node element. The node pointer
+ * and the higher level structure start at the same address
+ * so the user can cast the pointers back and forth.
+ *
+ */
+struct RBTree_Node_struct {
+ /** This points to the node's parent */
+ RBTree_Node *parent;
+ /** child[0] points to the left child, child[1] points to the right child */
+ RBTree_Node *child[2];
+ /** This is the integer value stored by this node, used for sorting */
+ unsigned int value;
+ /** The color of the node. Either red or black */
+ RBTree_Color color;
+};
</font>
<font color='#000088'>+/**
+ * @brief macro to return the structure containing the @a node.
+ *
+ * This macro returns a pointer of type @a container_type that points
+ * to the structure containing @a node, where @a node_field_name is the
+ * field name of the RBTree_Node structure in @a container_type.
+ *
+ */
</font> #define _RBTree_Container_of(node,container_type, node_field_name) \
<font color='#880000'>- ((container_type*) \
- ((size_t)node - ((size_t)(&((container_type *)0)->node_field_name))))
</font><font color='#000088'>+((container_type*) \
+ ((size_t)node - ((size_t)(&((container_type *)0)->node_field_name))))
+
+/**
+ * This type indicates the direction.
+ */
+typedef enum {
+ RBT_LEFT=0,
+ RBT_RIGHT=1
+} RBTree_Direction;
</font>
<font color='#000088'>+/**
+ * @struct RBTree_Control
+ *
+ * This is used to manage a RBT. A rbtree consists of a tree of zero or more
+ * nodes.
+ *
+ * @note This implementation does not require special checks for
+ * manipulating the root element of the RBT.
+ * To accomplish this the @a RBTree_Control structure can be overlaid
+ * with a @ref RBTree_Node structure to act as a "dummy root",
+ * which has a NULL parent and its left child is the root.
+ */
+
+/* the RBTree_Control is actually part of the RBTree structure as an
+ * RBTree_Node. The mapping of fields from RBTree_Control to RBTree_Node are:
+ * permanent_null == parent
+ * root == left
+ * first[0] == right
+ */
+typedef struct {
+ /** This points to a NULL. Useful for finding the root. */
+ RBTree_Node *permanent_null;
+ /** This points to the root node of the RBT. */
+ RBTree_Node *root;
+ /** This points to the min and max nodes of this RBT. */
+ RBTree_Node *first[2];
+} RBTree_Control;
</font>
<font color='#880000'>- typedef enum {
- RBT_LEFT=0,
- RBT_RIGHT=1
- } RBTree_Direction;
-
- /**
- * @struct RBTree_Control
- *
- * This is used to manage a RBT. A rbtree consists of a tree of zero or more
- * nodes.
- *
- * @note This implementation does not require special checks for
- * manipulating the root element of the RBT.
- * To accomplish this the @a RBTree_Control structure can be overlaid
- * with a @ref RBTree_Node structure to act as a "dummy root",
- * which has a NULL parent and its left child is the root.
- */
-
- /* the RBTree_Control is actually part of the RBTree structure as an
- * RBTree_Node. The mapping of fields from RBTree_Control to RBTree_Node are:
- * permanent_null == parent
- * root == left
- * first[0] == right
- */
- typedef struct {
- /** This points to a NULL. Useful for finding the root. */
- RBTree_Node *permanent_null;
- /** This points to the root node of the RBT. */
- RBTree_Node *root;
- /** This points to the min and max nodes of this RBT. */
- RBTree_Node *first[2];
- } RBTree_Control;
-
- /**
- * @brief RBTree initializer for an empty rbtree with designator @a name.
- */
</font><font color='#000088'>+/**
+ * @brief RBTree initializer for an empty rbtree with designator @a name.
+ */
</font> #define RBTREE_INITIALIZER_EMPTY(name) \
<font color='#880000'>- { \
- .permanent_null = NULL, \
- .root = NULL, \
- .first[0] = NULL, \
- .first[1] = NULL, \
- }
-
- /**
- * @brief RBTree definition for an empty rbtree with designator @a name.
- */
</font><font color='#000088'>+{ \
+ .permanent_null = NULL, \
+ .root = NULL, \
+ .first[0] = NULL, \
+ .first[1] = NULL, \
+}
+
+/**
+ * @brief RBTree definition for an empty rbtree with designator @a name.
+ */
</font> #define RBTREE_DEFINE_EMPTY(name) \
<font color='#880000'>- RBTree_Control name = RBTREE_INITIALIZER_EMPTY(name)
</font><font color='#000088'>+RBTree_Control name = RBTREE_INITIALIZER_EMPTY(name)
</font>
<font color='#880000'>- /**
- * @brief RBTree_Node initializer for an empty node with designator @a name.
- */
</font><font color='#000088'>+/**
+ * @brief RBTree_Node initializer for an empty node with designator @a name.
+ */
</font> #define RBTREE_NODE_INITIALIZER_EMPTY(name) \
<font color='#880000'>- { \
- .parent = NULL, \
- .child[0] = NULL, \
- .child[1] = NULL, \
- .value = -1, \
- RBT_RED \
- }
-
- /**
- * @brief RBTree definition for an empty rbtree with designator @a name.
- */
</font><font color='#000088'>+{ \
+ .parent = NULL, \
+ .child[0] = NULL, \
+ .child[1] = NULL, \
+ .value = -1, \
+ RBT_RED \
+}
+
+/**
+ * @brief RBTree definition for an empty rbtree with designator @a name.
+ */
</font> #define RBTREE_NODE_DEFINE_EMPTY(name) \
<font color='#880000'>- RBTree_Node name = RBTREE_NODE_INITIALIZER_EMPTY(name)
</font><font color='#000088'>+RBTree_Node name = RBTREE_NODE_INITIALIZER_EMPTY(name)
+
+/**
+ * @brief Initialize a RBTree Header
+ *
+ * This routine initializes @a the_rbtree structure to manage the
+ * contiguous array of @a number_nodes nodes which starts at
+ * @a starting_address. Each node is of @a node_size bytes.
+ */
+void _RBTree_Initialize(
+ RBTree_Control *the_rbtree,
+ void *starting_address,
+ size_t number_nodes,
+ size_t node_size
+);
+
+/**
+ * @brief Obtain the min or max node of a rbtree
+ *
+ * This function removes the min or max node from @a the_rbtree and returns
+ * a pointer to that node. If @a the_rbtree is empty, then NULL is returned.
+ * @a dir specifies whether to return the min (0) or max (1).
+ *
+ * @return This method returns a pointer to a node. If a node was removed,
+ * then a pointer to that node is returned. If @a the_rbtree was
+ * empty, then NULL is returned.
+ *
+ * @note It disables interrupts to ensure the atomicity of the get operation.
+ */
+RBTree_Node *_RBTree_Get(
+ RBTree_Control *the_rbtree,
+ RBTree_Direction dir
+);
+
+/**
+ * @brief Check the min or max node on a rbtree
+ *
+ * This function returns a pointer to the min or max node of @a the_rbtree.
+ * If @a the_rbtree is empty, then NULL is returned. @a dir specifies
+ * whether to return the min (0) or max (1).
+ *
+ * @return This method returns a pointer to a node.
+ * If @a the_rbtree was empty, then NULL is returned.
+ *
+ * @note It disables interrupts to ensure the atomicity of the get operation.
+ */
+RBTree_Node *_RBTree_Peek(
+ RBTree_Control *the_rbtree,
+ RBTree_Direction dir
+);
+
+/**
+ * @brief Find the node with given value in the tree
+ *
+ * This function returns a pointer to the node with value equal to @a value
+ * if it exists in the Red-Black Tree @a the_rbtree, and NULL if not.
+ */
+RBTree_Node *_RBTree_Find(
+ RBTree_Control *the_rbtree,
+ unsigned int value
+);
+
+/**
+ * @brief Find the control structure of the tree containing the given node
+ *
+ * This function returns a pointer to the control structure of the tree
+ * containing @a the_node, if it exists, and NULL if not.
+ */
+RBTree_Control *_RBTree_Find_header(
+ RBTree_Node *the_node
+);
+
+/**
+ * @brief Insert a Node (unprotected)
+ *
+ * This routine inserts @a the_node on the Red-Black Tree @a the_rbtree.
+ *
+ * @retval 0 Successfully inserted.
+ * @retval -1 NULL @a the_node.
+ * @retval RBTree_Node* if one with equal value to @a the_node->value exists
+ * in @a the_rbtree.
+ *
+ * @note It does NOT disable interrupts to ensure the atomicity
+ * of the extract operation.
+ */
+RBTree_Node *_RBTree_Insert_unprotected(
+ RBTree_Control *the_rbtree,
+ RBTree_Node *the_node
+);
</font>
<font color='#000088'>+/**
+ * @brief Insert a node on a rbtree
+ *
+ * This routine inserts @a the_node on the tree @a the_rbtree.
+ *
+ * @note It disables interrupts to ensure the atomicity
+ * of the extract operation.
+ */
+void _RBTree_Insert(
+ RBTree_Control *the_rbtree,
+ RBTree_Node *the_node
+);
</font>
<font color='#000088'>+/**
+ * @brief Extract a Node (unprotected)
+ *
+ * This routine extracts (removes) @a the_node from @a the_rbtree.
+ *
+ * @note It does NOT disable interrupts to ensure the atomicity
+ * of the extract operation.
+ */
+void _RBTree_Extract_unprotected(
+ RBTree_Control *the_rbtree,
+ RBTree_Node *the_node
+);
</font>
<font color='#880000'>- /**
- * @brief Initialize a RBTree Header
- *
- * This routine initializes @a the_rbtree structure to manage the
- * contiguous array of @a number_nodes nodes which starts at
- * @a starting_address. Each node is of @a node_size bytes.
- */
- void _RBTree_Initialize(
- RBTree_Control *the_rbtree,
- void *starting_address,
- size_t number_nodes,
- size_t node_size
- );
-
- /**
- * @brief Obtain the min or max node of a rbtree
- *
- * This function removes the min or max node from @a the_rbtree and returns
- * a pointer to that node. If @a the_rbtree is empty, then NULL is returned.
- * @a dir specifies whether to return the min (0) or max (1).
- *
- * @return This method returns a pointer to a node. If a node was removed,
- * then a pointer to that node is returned. If @a the_rbtree was
- * empty, then NULL is returned.
- *
- * @note It disables interrupts to ensure the atomicity of the get operation.
- */
- RBTree_Node *_RBTree_Get(
- RBTree_Control *the_rbtree,
- RBTree_Direction dir
- );
-
- /**
- * @brief Check the min or max node on a rbtree
- *
- * This function returns a pointer to the min or max node of @a the_rbtree.
- * If @a the_rbtree is empty, then NULL is returned. @a dir specifies
- * whether to return the min (0) or max (1).
- *
- * @return This method returns a pointer to a node.
- * If @a the_rbtree was empty, then NULL is returned.
- *
- * @note It disables interrupts to ensure the atomicity of the get operation.
- */
- RBTree_Node *_RBTree_Peek(
- RBTree_Control *the_rbtree,
- RBTree_Direction dir
- );
-
- /** @brief Find the node with given value in the tree
- *
- * This function returns a pointer to the node with value equal to @a value
- * if it exists in the Red-Black Tree @a the_rbtree, and NULL if not.
- */
- RBTree_Node *_RBTree_Find(
- RBTree_Control *the_rbtree,
- unsigned int value
- );
-
- /** @brief Find the control structure of the tree containing the given node
- *
- * This function returns a pointer to the control structure of the tree
- * containing @a the_node, if it exists, and NULL if not.
- */
- RBTree_Control *_RBTree_Find_header(
- RBTree_Node *the_node
- );
-
- /** @brief Insert a Node (unprotected)
- *
- * This routine inserts @a the_node on the Red-Black Tree @a the_rbtree.
- *
- * @retval 0 Successfully inserted.
- * @retval -1 NULL @a the_node.
- * @retval RBTree_Node* if one with equal value to @a the_node->value exists
- * in @a the_rbtree.
- *
- * @note It does NOT disable interrupts to ensure the atomicity
- * of the extract operation.
- */
- RBTree_Node *_RBTree_Insert_unprotected(
- RBTree_Control *the_rbtree,
- RBTree_Node *the_node
- );
-
- /**
- * @brief Insert a node on a rbtree
- *
- * This routine inserts @a the_node on the tree @a the_rbtree.
- *
- * @note It disables interrupts to ensure the atomicity
- * of the extract operation.
- */
- void _RBTree_Insert(
- RBTree_Control *the_rbtree,
- RBTree_Node *the_node
- );
-
-
- /** @brief Extract a Node (unprotected)
- *
- * This routine extracts (removes) @a the_node from @a the_rbtree.
- *
- * @note It does NOT disable interrupts to ensure the atomicity
- * of the extract operation.
- */
-
- void _RBTree_Extract_unprotected(
- RBTree_Control *the_rbtree,
- RBTree_Node *the_node
- );
-
-
- /**
- * @brief Delete a node from the rbtree
- *
- * This routine deletes @a the_node from @a the_rbtree.
- *
- * @note It disables interrupts to ensure the atomicity of the
- * append operation.
- */
- void _RBTree_Extract(
- RBTree_Control *the_rbtree,
- RBTree_Node *the_node
- );
</font><font color='#000088'>+/**
+ * @brief Delete a node from the rbtree
+ *
+ * This routine deletes @a the_node from @a the_rbtree.
+ *
+ * @note It disables interrupts to ensure the atomicity of the
+ * append operation.
+ */
+void _RBTree_Extract(
+ RBTree_Control *the_rbtree,
+ RBTree_Node *the_node
+);
</font>
#ifndef __RTEMS_APPLICATION__
#include <rtems/score/rbtree.inl>
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/thread.h:1.106 rtems/cpukit/score/include/rtems/score/thread.h:1.107
--- rtems/cpukit/score/include/rtems/score/thread.h:1.106 Fri Jun 17 09:31:46 2011
+++ rtems/cpukit/score/include/rtems/score/thread.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -182,13 +182,15 @@
</font> */
typedef void (*Thread_CPU_budget_algorithm_callout )( Thread_Control * );
<font color='#880000'>-/** @brief Per Task Variable Manager Structure Forward Reference
</font><font color='#000088'>+/**
+ * @brief Per Task Variable Manager Structure Forward Reference
</font> *
* Forward reference to the per task variable structure.
*/
struct rtems_task_variable_tt;
<font color='#880000'>-/** @brief Per Task Variable Manager Structure
</font><font color='#000088'>+/**
+ * @brief Per Task Variable Manager Structure
</font> *
* This is the internal structure used to manager per Task Variables.
*/
<font color='#997700'>@@ -270,7 +272,8 @@
</font> const void *immutable_object;
} Thread_Wait_information_Object_argument_type;
<font color='#880000'>-/** @brief Thread Blocking Management Information
</font><font color='#000088'>+/**
+ * @brief Thread Blocking Management Information
</font> *
* This contains the information required to manage a thread while it is
* blocked and to return information to it.
<font color='#997700'>@@ -788,39 +791,45 @@
</font>
#if defined(RTEMS_SMP)
<font color='#880000'>- /** @brief _Thread_Dispatch_initialization
</font><font color='#000088'>+ /**
+ * @brief _Thread_Dispatch_initialization
</font> *<span style="background-color: #FF0000"> </span>
* This routine initializes the thread dispatching subsystem.
*/
void _Thread_Dispatch_initialization(void);
<font color='#880000'>- /** @brief _Thread_Dispatch_in_critical_section
</font><font color='#000088'>+ /**
+ * @brief _Thread_Dispatch_in_critical_section
</font> *<span style="background-color: #FF0000"> </span>
* This routine returns true if thread dispatch indicates
* that we are in a critical section.
*/
bool _Thread_Dispatch_in_critical_section(void);
<font color='#880000'>- /** @brief _Thread_Dispatch_get_disable_level
</font><font color='#000088'>+ /**
+ * @brief _Thread_Dispatch_get_disable_level
</font> *<span style="background-color: #FF0000"> </span>
* This routine returns value of the the thread dispatch level.
*/
uint32_t _Thread_Dispatch_get_disable_level(void);
<font color='#880000'>- /** @brief _Thread_Dispatch_set_disable_level
</font><font color='#000088'>+ /**
+ * @brief _Thread_Dispatch_set_disable_level
</font> *<span style="background-color: #FF0000"> </span>
* This routine sets thread dispatch level to the<span style="background-color: #FF0000"> </span>
* value passed in.
*/
uint32_t _Thread_Dispatch_set_disable_level(uint32_t value);
<font color='#880000'>- /** @brief _Thread_Dispatch_increment_disable_level
</font><font color='#000088'>+ /**
+ * @brief _Thread_Dispatch_increment_disable_level
</font> *
* This rountine increments the thread dispatch level
*/
uint32_t _Thread_Dispatch_increment_disable_level(void);
<font color='#880000'>- /** @brief _Thread_Dispatch_decrement_disable_level
</font><font color='#000088'>+ /**
+ * @brief _Thread_Dispatch_decrement_disable_level
</font> *<span style="background-color: #FF0000"> </span>
* This routine decrements the thread dispatch level.
*/
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/threadmp.h:1.20 rtems/cpukit/score/include/rtems/score/threadmp.h:1.21
--- rtems/cpukit/score/include/rtems/score/threadmp.h:1.20 Fri Nov 27 23:58:54 2009
+++ rtems/cpukit/score/include/rtems/score/threadmp.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2006.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -33,7 +33,8 @@
</font> extern "C" {
#endif
<font color='#880000'>-/** @brief _Thread_MP_Handler_initialization
</font><font color='#000088'>+/**
+ * @brief _Thread_MP_Handler_initialization
</font> *
* This routine initializes the multiprocessing portion of the Thread Handler.
*/
<font color='#997700'>@@ -41,7 +42,8 @@
</font> uint32_t maximum_proxies
);
<font color='#880000'>-/** @brief _Thread_MP_Allocate_proxy
</font><font color='#000088'>+/**
+ * @brief _Thread_MP_Allocate_proxy
</font> *
* This allocates a proxy control block from
* the inactive chain of free proxy control blocks.
<font color='#997700'>@@ -53,7 +55,8 @@
</font> States_Control the_state
);
<font color='#880000'>-/** @brief _Thread_MP_Find_proxy
</font><font color='#000088'>+/**
+ * @brief _Thread_MP_Find_proxy
</font> *
* This function removes the proxy control block for the specified
* id from the active chain of proxy control blocks.
<font color='#997700'>@@ -62,13 +65,15 @@
</font> Objects_Id the_id
);
<font color='#880000'>-/** @brief Active Proxy Set
</font><font color='#000088'>+/**
+ * @brief Active Proxy Set
</font> *
* The following chain is used to manage the active set proxies.
*/
SCORE_EXTERN Chain_Control _Thread_MP_Active_proxies;
<font color='#880000'>-/** @brief Inactive Proxy Set
</font><font color='#000088'>+/**
+ * @brief Inactive Proxy Set
</font> *
* The following chain is used to manage the inactive set of proxies.
*/
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/threadq.h:1.29 rtems/cpukit/score/include/rtems/score/threadq.h:1.30
--- rtems/cpukit/score/include/rtems/score/threadq.h:1.29 Mon Jun 14 01:08:40 2010
+++ rtems/cpukit/score/include/rtems/score/threadq.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -60,7 +60,8 @@
</font> void *
);
<font color='#880000'>-/** @brief Thread queue Dequeue
</font><font color='#000088'>+/**
+ * @brief Thread queue Dequeue
</font> *
* This function returns a pointer to a thread waiting on
* the_thread_queue. The selection of this thread is based on
<font color='#997700'>@@ -71,7 +72,8 @@
</font> Thread_queue_Control *the_thread_queue
);
<font color='#880000'>-/** @brief Thread queue Enqueue Wrapper
</font><font color='#000088'>+/**
+ * @brief Thread queue Enqueue Wrapper
</font> *
* This routine enqueues the currently executing thread on
* the_thread_queue with an optional timeout.
<font color='#997700'>@@ -83,7 +85,8 @@
</font> _Thread_queue_Timeout )
<font color='#880000'>-/** @brief Thread queue Enqueue
</font><font color='#000088'>+/**
+ * @brief Thread queue Enqueue
</font> *
* This routine enqueues the currently executing thread on
* the_thread_queue with an optional timeout.
<font color='#997700'>@@ -108,7 +111,8 @@
</font> Thread_Control *the_thread
);
<font color='#880000'>-/** @brief Thread queue Extract
</font><font color='#000088'>+/**
+ * @brief Thread queue Extract
</font> *
* This routine removes the_thread from the_thread_queue
* and cancels any timeouts associated with this blocking.
<font color='#997700'>@@ -118,7 +122,8 @@
</font> Thread_Control *the_thread
);
<font color='#880000'>-/** @brief Thread queue Extract with proxy
</font><font color='#000088'>+/**
+ * @brief Thread queue Extract with proxy
</font> *
* This routine extracts the_thread from the_thread_queue
* and ensures that if there is a proxy for this task on
<font color='#997700'>@@ -128,7 +133,8 @@
</font> Thread_Control *the_thread
);
<font color='#880000'>-/** @brief Thread queue First
</font><font color='#000088'>+/**
+ * @brief Thread queue First
</font> *
* This function returns a pointer to the "first" thread
* on the_thread_queue. The "first" thread is selected
<font color='#997700'>@@ -138,7 +144,8 @@
</font> Thread_queue_Control *the_thread_queue
);
<font color='#880000'>-/** @brief Thread queue Flush
</font><font color='#000088'>+/**
+ * @brief Thread queue Flush
</font> *
* This routine unblocks all threads blocked on the_thread_queue
* and cancels any associated timeouts.
<font color='#997700'>@@ -149,7 +156,8 @@
</font> uint32_t status
);
<font color='#880000'>-/** @brief Thread queue Initialize
</font><font color='#000088'>+/**
+ * @brief Thread queue Initialize
</font> *
* This routine initializes the_thread_queue based on the
* discipline indicated in attribute_set. The state set on
<font color='#997700'>@@ -162,7 +170,8 @@
</font> uint32_t timeout_status
);
<font color='#880000'>-/** @brief Thread queue Dequeue priority
</font><font color='#000088'>+/**
+ * @brief Thread queue Dequeue priority
</font> *
* This function returns a pointer to the highest priority
* thread waiting on the_thread_queue. If no threads are waiting
<font color='#997700'>@@ -172,7 +181,8 @@
</font> Thread_queue_Control *the_thread_queue
);
<font color='#880000'>-/** @brief Thread queue Enqueue priority
</font><font color='#000088'>+/**
+ * @brief Thread queue Enqueue priority
</font> *
* This routine enqueues the currently executing thread on
* the_thread_queue with an optional timeout using the
<font color='#997700'>@@ -184,7 +194,8 @@
</font> ISR_Level *level_p
);
<font color='#880000'>-/** @brief Thread queue Extract priority Helper
</font><font color='#000088'>+/**
+ * @brief Thread queue Extract priority Helper
</font> *
* This routine removes the_thread from the_thread_queue
* and cancels any timeouts associated with this blocking.
<font color='#997700'>@@ -205,7 +216,8 @@
</font> _Thread_queue_Extract_priority_helper( _the_thread_queue, _the_thread, false )
<font color='#880000'>-/** @brief Thread queue First priority
</font><font color='#000088'>+/**
+ * @brief Thread queue First priority
</font> *
* This function returns a pointer to the "first" thread
* on the_thread_queue. The "first" thread is the highest
<font color='#997700'>@@ -215,7 +227,8 @@
</font> Thread_queue_Control *the_thread_queue
);
<font color='#880000'>-/** @brief Thread queue Dequeue FIFO
</font><font color='#000088'>+/**
+ * @brief Thread queue Dequeue FIFO
</font> *
* This function returns a pointer to the thread which has
* been waiting the longest on the_thread_queue. If no
<font color='#997700'>@@ -225,7 +238,8 @@
</font> Thread_queue_Control *the_thread_queue
);
<font color='#880000'>-/** @brief Thread queue Enqueue FIFO
</font><font color='#000088'>+/**
+ * @brief Thread queue Enqueue FIFO
</font> *
* This routine enqueues the currently executing thread on
* the_thread_queue with an optional timeout using the
<font color='#997700'>@@ -237,7 +251,8 @@
</font> ISR_Level *level_p
);
<font color='#880000'>-/** @brief Thread queue Extract FIFO
</font><font color='#000088'>+/**
+ * @brief Thread queue Extract FIFO
</font> *
* This routine removes the_thread from the_thread_queue
* and cancels any timeouts associated with this blocking.
<font color='#997700'>@@ -247,7 +262,8 @@
</font> Thread_Control *the_thread
);
<font color='#880000'>-/** @brief Thread queue First FIFO
</font><font color='#000088'>+/**
+ * @brief Thread queue First FIFO
</font> *
* This function returns a pointer to the "first" thread
* on the_thread_queue. The first thread is the thread
<font color='#997700'>@@ -257,7 +273,8 @@
</font> Thread_queue_Control *the_thread_queue
);
<font color='#880000'>-/** @brief Thread queue timeout
</font><font color='#000088'>+/**
+ * @brief Thread queue timeout
</font> *
* This routine is invoked when a task's request has not
* been satisfied after the timeout interval specified to
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/timespec.h:1.10 rtems/cpukit/score/include/rtems/score/timespec.h:1.11
--- rtems/cpukit/score/include/rtems/score/timespec.h:1.10 Wed Feb 23 08:02:20 2011
+++ rtems/cpukit/score/include/rtems/score/timespec.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -5,7 +5,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -34,7 +34,8 @@
</font> extern "C" {
#endif
<font color='#880000'>-/** @brief Set Timespec to Seconds Nanosecond
</font><font color='#000088'>+/**
+ * @brief Set Timespec to Seconds Nanosecond
</font> *
* This method sets the timespec to the specified seconds and nanoseconds
* value.
<font color='#997700'>@@ -49,7 +50,8 @@
</font> (_time)->tv_nsec = (_nanoseconds); \
} while (0)
<font color='#880000'>-/** @brief Zero Timespec
</font><font color='#000088'>+/**
+ * @brief Zero Timespec
</font> *
* This method sets the timespec to zero.
* value.
<font color='#997700'>@@ -62,7 +64,8 @@
</font> (_time)->tv_nsec = 0; \
} while (0)
<font color='#880000'>-/** @brief Get Seconds Portion of Timespec
</font><font color='#000088'>+/**
+ * @brief Get Seconds Portion of Timespec
</font> *
* This method returns the seconds portion of the specified timespec
*
<font color='#997700'>@@ -73,7 +76,8 @@
</font> #define _Timespec_Get_seconds( _time ) \
((_time)->tv_sec)
<font color='#880000'>-/** @brief Get Nanoseconds Portion of Timespec
</font><font color='#000088'>+/**
+ * @brief Get Nanoseconds Portion of Timespec
</font> *
* This method returns the nanoseconds portion of the specified timespec
*
<font color='#997700'>@@ -84,7 +88,8 @@
</font> #define _Timespec_Get_nanoseconds( _time ) \
((_time)->tv_nsec)
<font color='#880000'>-/** @brief Is Timespec Valid
</font><font color='#000088'>+/**
+ * @brief Is Timespec Valid
</font> *
* This method determines the validity of a timespec.
*
<font color='#997700'>@@ -97,7 +102,8 @@
</font> const struct timespec *time
);
<font color='#880000'>-/** @brief Timespec Less Than Operator
</font><font color='#000088'>+/**
+ * @brief Timespec Less Than Operator
</font> *
* This method is the less than operator for timespecs.
*
<font color='#997700'>@@ -112,7 +118,8 @@
</font> const struct timespec *rhs
);
<font color='#880000'>-/** @brief Timespec Greater Than Operator
</font><font color='#000088'>+/**
+ * @brief Timespec Greater Than Operator
</font> *
* This method is the greater than operator for timespecs.
*
<font color='#997700'>@@ -127,7 +134,8 @@
</font> const struct timespec *rhs
);
<font color='#880000'>-/** @brief Timespec equal to Operator
</font><font color='#000088'>+/**
+ * @brief Timespec equal to Operator
</font> *
* This method is the is equal to than operator for timespecs.
*
<font color='#997700'>@@ -142,7 +150,8 @@
</font> ((lhs)->tv_nsec == (rhs)->tv_nsec) \
)
<font color='#880000'>-/** @brief Add to a Timespec
</font><font color='#000088'>+/**
+ * @brief Add to a Timespec
</font> *
* This routine adds two timespecs. The second argument is added
* to the first.
<font color='#997700'>@@ -157,7 +166,8 @@
</font> const struct timespec *add
);
<font color='#880000'>-/** @brief Convert Timespec to Number of Ticks
</font><font color='#000088'>+/**
+ * @brief Convert Timespec to Number of Ticks
</font> *
* This routine convert the @a time timespec to the corresponding number
* of clock ticks.
<font color='#997700'>@@ -170,7 +180,8 @@
</font> const struct timespec *time
);
<font color='#880000'>-/** @brief Convert Ticks to Timespec
</font><font color='#000088'>+/**
+ * @brief Convert Ticks to Timespec
</font> *
* This routine converts the @a ticks value to the corresponding
* timespec format @a time.
<font color='#997700'>@@ -183,7 +194,8 @@
</font> struct timespec *time
);
<font color='#880000'>-/** @brief Subtract Two Timespec
</font><font color='#000088'>+/**
+ * @brief Subtract Two Timespec
</font> *
* This routine subtracts two timespecs. @a result is set to
* @a end - @a start.
<font color='#997700'>@@ -200,7 +212,8 @@
</font> struct timespec *result
);
<font color='#880000'>-/** @brief Divide Timespec By Integer
</font><font color='#000088'>+/**
+ * @brief Divide Timespec By Integer
</font> *
* This routine divides a timespec by an integer value. The expected
* use is to assist in benchmark calculations where you typically
<font color='#997700'>@@ -218,7 +231,8 @@
</font> struct timespec *result
);
<font color='#880000'>-/** @brief Divide Timespec
</font><font color='#000088'>+/**
+ * @brief Divide Timespec
</font> *
* This routine divides a timespec by another timespec. The
* intended use is for calculating percentages to three decimal points.
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/timestamp.h:1.5 rtems/cpukit/score/include/rtems/score/timestamp.h:1.6
--- rtems/cpukit/score/include/rtems/score/timestamp.h:1.5 Mon Jun 14 01:08:40 2010
+++ rtems/cpukit/score/include/rtems/score/timestamp.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -5,7 +5,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -130,7 +130,8 @@
</font> typedef Timestamp64_Control Timestamp_Control;
#endif
<font color='#880000'>-/** @brief Set Timestamp to Seconds Nanosecond
</font><font color='#000088'>+/**
+ * @brief Set Timestamp to Seconds Nanosecond
</font> *
* This method sets the timestamp to the specified seconds and nanoseconds
* value.
<font color='#997700'>@@ -147,7 +148,8 @@
</font> _Timestamp64_Set( _time, _seconds, _nanoseconds )
#endif
<font color='#880000'>-/** @brief Zero Timestamp
</font><font color='#000088'>+/**
+ * @brief Zero Timestamp
</font> *
* This method sets the timestamp to zero.
* value.
<font color='#997700'>@@ -162,7 +164,8 @@
</font> _Timestamp64_Set_to_zero( _time )
#endif
<font color='#880000'>-/** @brief Is Timestamp Valid
</font><font color='#000088'>+/**
+ * @brief Is Timestamp Valid
</font> *
* This method determines the validity of a timestamp.
*
<font color='#997700'>@@ -179,7 +182,8 @@
</font> _Timestamp64_Is_valid( _time )
#endif
<font color='#880000'>-/** @brief Timestamp Less Than Operator
</font><font color='#000088'>+/**
+ * @brief Timestamp Less Than Operator
</font> *
* This method is the less than operator for timestamps.
*
<font color='#997700'>@@ -197,7 +201,8 @@
</font> _Timestamp64_Less_than( _lhs, _rhs )
#endif
<font color='#880000'>-/** @brief Timestamp Greater Than Operator
</font><font color='#000088'>+/**
+ * @brief Timestamp Greater Than Operator
</font> *
* This method is the greater than operator for timestamps.
*
<font color='#997700'>@@ -215,7 +220,8 @@
</font> _Timestamp64_Greater_than( _lhs, _rhs )
#endif
<font color='#880000'>-/** @brief Timestamp equal to Operator
</font><font color='#000088'>+/**
+ * @brief Timestamp equal to Operator
</font> *
* This method is the is equal to than operator for timestamps.
*
<font color='#997700'>@@ -233,7 +239,8 @@
</font> _Timestamp64_Equal_to( _lhs, _rhs )
#endif
<font color='#880000'>-/** @brief Add to a Timestamp
</font><font color='#000088'>+/**
+ * @brief Add to a Timestamp
</font> *
* This routine adds two timestamps. The second argument is added
* to the first.
<font color='#997700'>@@ -251,7 +258,8 @@
</font> _Timestamp64_Add_to( _time, _add )
#endif
<font color='#880000'>-/** @brief Add to a Timestamp (At Clock Tick)
</font><font color='#000088'>+/**
+ * @brief Add to a Timestamp (At Clock Tick)
</font> *
* This routine adds two timestamps. The second argument is added
* to the first.
<font color='#997700'>@@ -275,7 +283,8 @@
</font> _Timestamp64_Add_to_at_tick( _time, _add )
#endif
<font color='#880000'>-/** @brief Convert Timestamp to Number of Ticks
</font><font color='#000088'>+/**
+ * @brief Convert Timestamp to Number of Ticks
</font> *
* This routine convert the @a time timestamp to the corresponding number
* of clock ticks.
<font color='#997700'>@@ -292,7 +301,8 @@
</font> _Timestamp64_To_ticks( _time )
#endif
<font color='#880000'>-/** @brief Convert Ticks to Timestamp
</font><font color='#000088'>+/**
+ * @brief Convert Ticks to Timestamp
</font> *
* This routine converts the @a _ticks value to the corresponding
* timestamp format @a _time.
<font color='#997700'>@@ -308,7 +318,8 @@
</font> _Timestamp64_From_ticks( _ticks, _time )
#endif
<font color='#880000'>-/** @brief Subtract Two Timestamp
</font><font color='#000088'>+/**
+ * @brief Subtract Two Timestamp
</font> *
* This routine subtracts two timestamps. @a result is set to
* @a end - @a start.
<font color='#997700'>@@ -328,7 +339,8 @@
</font> _Timestamp64_Subtract( _start, _end, _result )
#endif
<font color='#880000'>-/** @brief Divide Timestamp By Integer
</font><font color='#000088'>+/**
+ * @brief Divide Timestamp By Integer
</font> *
* This routine divides a timestamp by an integer value. The expected
* use is to assist in benchmark calculations where you typically
<font color='#997700'>@@ -348,7 +360,8 @@
</font> _Timestamp64_Divide_by_integer( _time, _iterations, _result )
#endif
<font color='#880000'>-/** @brief Divide Timestamp
</font><font color='#000088'>+/**
+ * @brief Divide Timestamp
</font> *
* This routine divides a timestamp by another timestamp. The
* intended use is for calculating percentages to three decimal points.
<font color='#997700'>@@ -368,7 +381,8 @@
</font> _Timestamp64_Divide( _lhs, _rhs, _ival_percentage, _fval_percentage )
#endif
<font color='#880000'>-/** @brief Get Seconds Portion of Timestamp
</font><font color='#000088'>+/**
+ * @brief Get Seconds Portion of Timestamp
</font> *
* This method returns the seconds portion of the specified timestamp
*
<font color='#997700'>@@ -384,7 +398,8 @@
</font> _Timestamp64_Get_seconds( _time )
#endif
<font color='#880000'>-/** @brief Get Nanoseconds Portion of Timestamp
</font><font color='#000088'>+/**
+ * @brief Get Nanoseconds Portion of Timestamp
</font> *
* This method returns the nanoseconds portion of the specified timestamp
*
<font color='#997700'>@@ -400,7 +415,8 @@
</font> _Timestamp64_Get_nanoseconds( _time )
#endif
<font color='#880000'>-/** @brief Convert Timestamp to struct timespec
</font><font color='#000088'>+/**
+ * @brief Convert Timestamp to struct timespec
</font> *
* This method returns the seconds portion of the specified timestamp
*
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/timestamp64.h:1.3 rtems/cpukit/score/include/rtems/score/timestamp64.h:1.4
--- rtems/cpukit/score/include/rtems/score/timestamp64.h:1.3 Sat Jun 12 00:56:26 2010
+++ rtems/cpukit/score/include/rtems/score/timestamp64.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -51,7 +51,8 @@
</font> */
typedef int64_t Timestamp64_Control;
<font color='#880000'>-/** @brief Set Timestamp to Seconds Nanosecond
</font><font color='#000088'>+/**
+ * @brief Set Timestamp to Seconds Nanosecond
</font> *
* This method sets the timestamp to the specified seconds and nanoseconds
* value.
<font color='#997700'>@@ -74,7 +75,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Zero Timestamp
</font><font color='#000088'>+/**
+ * @brief Zero Timestamp
</font> *
* This method sets the timestamp to zero.
* value.
<font color='#997700'>@@ -90,7 +92,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Is Timestamp Valid
</font><font color='#000088'>+/**
+ * @brief Is Timestamp Valid
</font> *
* This method determines the validity of a timestamp.
*
<font color='#997700'>@@ -102,7 +105,8 @@
</font> #define _Timestamp64_Is_valid( _time ) \
(1)
<font color='#880000'>-/** @brief Timestamp Less Than Operator
</font><font color='#000088'>+/**
+ * @brief Timestamp Less Than Operator
</font> *
* This method is the less than operator for timestamps.
*
<font color='#997700'>@@ -122,7 +126,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Timestamp Greater Than Operator
</font><font color='#000088'>+/**
+ * @brief Timestamp Greater Than Operator
</font> *
* This method is the greater than operator for timestamps.
*
<font color='#997700'>@@ -142,7 +147,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Timestamp equal to Operator
</font><font color='#000088'>+/**
+ * @brief Timestamp equal to Operator
</font> *
* This method is the is equal to than operator for timestamps.
*
<font color='#997700'>@@ -162,7 +168,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Add to a Timestamp
</font><font color='#000088'>+/**
+ * @brief Add to a Timestamp
</font> *
* This routine adds two timestamps. The second argument is added
* to the first.
<font color='#997700'>@@ -182,7 +189,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Add to a Timestamp (At Clock Tick)
</font><font color='#000088'>+/**
+ * @brief Add to a Timestamp (At Clock Tick)
</font> *
* This routine adds two timestamps. The second argument is added
* to the first.
<font color='#997700'>@@ -211,7 +219,8 @@
</font> return 0;
}
<font color='#880000'>-/** @brief Convert Timestamp to Number of Ticks
</font><font color='#000088'>+/**
+ * @brief Convert Timestamp to Number of Ticks
</font> *
* This routine convert the @a time timestamp to the corresponding number
* of clock ticks.
<font color='#997700'>@@ -224,7 +233,8 @@
</font> const Timestamp64_Control *_time
);
<font color='#880000'>-/** @brief Convert Ticks to Timestamp
</font><font color='#000088'>+/**
+ * @brief Convert Ticks to Timestamp
</font> *
* This routine converts the @a _ticks value to the corresponding
* timestamp format @a _time.
<font color='#997700'>@@ -237,7 +247,8 @@
</font> Timestamp64_Control *_time
);
<font color='#880000'>-/** @brief Subtract Two Timestamp
</font><font color='#000088'>+/**
+ * @brief Subtract Two Timestamp
</font> *
* This routine subtracts two timestamps. @a result is set to
* @a end - @a start.
<font color='#997700'>@@ -262,7 +273,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Divide Timestamp By Integer
</font><font color='#000088'>+/**
+ * @brief Divide Timestamp By Integer
</font> *
* This routine divides a timestamp by an integer value. The expected
* use is to assist in benchmark calculations where you typically
<font color='#997700'>@@ -287,7 +299,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Divide Timestamp
</font><font color='#000088'>+/**
+ * @brief Divide Timestamp
</font> *
* This routine divides a timestamp by another timestamp. The
* intended use is for calculating percentages to three decimal points.
<font color='#997700'>@@ -306,7 +319,8 @@
</font> uint32_t *_fval_percentage
);
<font color='#880000'>-/** @brief Get Seconds Portion of Timestamp
</font><font color='#000088'>+/**
+ * @brief Get Seconds Portion of Timestamp
</font> *
* This method returns the seconds portion of the specified timestamp
*
<font color='#997700'>@@ -323,7 +337,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Get Nanoseconds Portion of Timestamp
</font><font color='#000088'>+/**
+ * @brief Get Nanoseconds Portion of Timestamp
</font> *
* This method returns the nanoseconds portion of the specified timestamp
*
<font color='#997700'>@@ -340,7 +355,8 @@
</font> );
#endif
<font color='#880000'>-/** @brief Convert Timestamp to struct timespec
</font><font color='#000088'>+/**
+ * @brief Convert Timestamp to struct timespec
</font> *
* This method returns the seconds portion of the specified timestamp
*
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/tod.h:1.41 rtems/cpukit/score/include/rtems/score/tod.h:1.42
--- rtems/cpukit/score/include/rtems/score/tod.h:1.41 Wed Feb 23 08:11:55 2011
+++ rtems/cpukit/score/include/rtems/score/tod.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -6,7 +6,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -102,7 +102,8 @@
</font> (((1987 - 1970 + 1) * TOD_SECONDS_PER_NON_LEAP_YEAR) + \
(4 * TOD_SECONDS_PER_DAY))
<font color='#880000'>-/** @brief RTEMS Epoch Year
</font><font color='#000088'>+/**
+ * @brief RTEMS Epoch Year
</font> *
* The following constant define the earliest year to which an
* time of day can be initialized. This is considered the
<font color='#997700'>@@ -117,37 +118,46 @@
</font> */
/**@{*/
<font color='#880000'>-/** @brief Is the Time Of Day Set
</font><font color='#000088'>+/**
+ * @brief Is the Time Of Day Set
</font> *
* This is true if the application has set the current
* time of day, and false otherwise.
*/
SCORE_EXTERN bool _TOD_Is_set;
<font color='#880000'>-/** @brief Current Time of Day (Timespec)
</font><font color='#000088'>+/**
+ * @brief Current Time of Day (Timespec)
+ *
</font> * The following contains the current time of day.
*/
SCORE_EXTERN Timestamp_Control _TOD_Now;
<font color='#880000'>-/** @brief Current Time of Day (Timespec)
</font><font color='#000088'>+/**
+ * @brief Current Time of Day (Timespec)
+ *
</font> * The following contains the running uptime.
*/
SCORE_EXTERN Timestamp_Control _TOD_Uptime;
<font color='#880000'>-/** @brief Seconds Since RTEMS Epoch
</font><font color='#000088'>+/**
+ * @brief Seconds Since RTEMS Epoch
+ *
</font> * The following contains the number of seconds from 00:00:00
* January 1, TOD_BASE_YEAR until the current time of day.
*/
#define _TOD_Seconds_since_epoch() \
_Timestamp_Get_seconds(&_TOD_Now)
<font color='#880000'>-/** @brief _TOD_Handler_initialization
</font><font color='#000088'>+/**
+ * @brief _TOD_Handler_initialization
</font> *
* This routine performs the initialization necessary for this handler.
*/
void _TOD_Handler_initialization(void);
<font color='#880000'>-/** @brief _TOD_Set
</font><font color='#000088'>+/**
+ * @brief _TOD_Set
</font> *
* This routine sets the current time of day to @a time and
* the equivalent SECONDS_SINCE_EPOCH.
<font color='#997700'>@@ -156,7 +166,8 @@
</font> const struct timespec *time
);
<font color='#880000'>-/** @brief _TOD_Get
</font><font color='#000088'>+/**
+ * @brief _TOD_Get
</font> *
* This routine returns the current time of day with potential accuracy
* to the nanosecond.
<font color='#997700'>@@ -167,7 +178,8 @@
</font> struct timespec *time
);
<font color='#880000'>-/** @brief _TOD_Get_uptime
</font><font color='#000088'>+/**
+ * @brief _TOD_Get_uptime
</font> *
* This routine returns the system uptime with potential accuracy
* to the nanosecond.
<font color='#997700'>@@ -178,7 +190,8 @@
</font> Timestamp_Control *time
);
<font color='#880000'>-/** @brief _TOD_Get_uptime_as_timespec
</font><font color='#000088'>+/**
+ * @brief _TOD_Get_uptime_as_timespec
</font> *
* This routine returns the system uptime with potential accuracy
* to the nanosecond.
<font color='#997700'>@@ -195,7 +208,8 @@
</font> */
void _TOD_Tickle_ticks( void );
<font color='#880000'>-/** @brief TOD_MILLISECONDS_TO_MICROSECONDS
</font><font color='#000088'>+/**
+ * @brief TOD_MILLISECONDS_TO_MICROSECONDS
</font> *
* This routine converts an interval expressed in milliseconds to microseconds.
*
<font color='#997700'>@@ -203,7 +217,8 @@
</font> */
#define TOD_MILLISECONDS_TO_MICROSECONDS(_ms) ((uint32_t)(_ms) * 1000L)
<font color='#880000'>-/** @brief TOD_MICROSECONDS_TO_TICKS
</font><font color='#000088'>+/**
+ * @brief TOD_MICROSECONDS_TO_TICKS
</font> *
* This routine converts an interval expressed in microseconds to ticks.
*
<font color='#997700'>@@ -213,7 +228,8 @@
</font> uint32_t microseconds
);
<font color='#880000'>-/** @brief TOD_MILLISECONDS_TO_TICKS
</font><font color='#000088'>+/**
+ * @brief TOD_MILLISECONDS_TO_TICKS
</font> *
* This routine converts an interval expressed in milliseconds to ticks.
*
<font color='#997700'>@@ -223,7 +239,8 @@
</font> uint32_t milliseconds
);
<font color='#880000'>-/** @brief How many ticks in a second?
</font><font color='#000088'>+/**
+ * @brief How many ticks in a second?
</font> *
* This method returns the number of ticks in a second.
*
<font color='#997700'>@@ -232,7 +249,8 @@
</font> */
uint32_t TOD_TICKS_PER_SECOND_method(void);
<font color='#880000'>-/** @brief Method to return number of ticks in a second
</font><font color='#000088'>+/**
+ * @brief Method to return number of ticks in a second
</font> *
* This method exists to hide the fact that TOD_TICKS_PER_SECOND can not
* be implemented as a macro in a .h file due to visibility issues.
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/watchdog.h:1.31 rtems/cpukit/score/include/rtems/score/watchdog.h:1.32
--- rtems/cpukit/score/include/rtems/score/watchdog.h:1.31 Thu Dec 16 08:50:12 2010
+++ rtems/cpukit/score/include/rtems/score/watchdog.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -7,7 +7,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2007.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -37,33 +37,38 @@
</font> extern "C" {
#endif
<font color='#880000'>-/** @brief Maximum Interval Length
</font><font color='#000088'>+/**
+ * @brief Maximum Interval Length
</font> *
* The following type defines the control block used to manage
* intervals.
*/
#define WATCHDOG_MAXIMUM_INTERVAL ((Watchdog_Interval) 0xffffffff)
<font color='#880000'>-/** @brief Watchdog Interval Type
</font><font color='#000088'>+/**
+ * @brief Watchdog Interval Type
</font> *
* This type is used to specify the length of intervals.
*/
typedef uint32_t Watchdog_Interval;
<font color='#880000'>-/** @brief Watchdog Nanoseconds Since Last Tick Extension
</font><font color='#000088'>+/**
+ * @brief Watchdog Nanoseconds Since Last Tick Extension
</font> *
* This type defines a pointer to the BSP plugin to obtain the number
* of nanoseconds since the last clock tick.
*/
typedef uint32_t (*Watchdog_Nanoseconds_since_last_tick_routine)(void);
<font color='#880000'>-/** @brief Watchdog Service Routine Return Type
</font><font color='#000088'>+/**
+ * @brief Watchdog Service Routine Return Type
</font> *
* This type defines the return type from a Watchdog Service Routine.
*/
typedef void Watchdog_Service_routine;
<font color='#880000'>-/** @brief Watchdog Service Routine Pointer Type
</font><font color='#000088'>+/**
+ * @brief Watchdog Service Routine Pointer Type
</font> *
* This type define a pointer to a watchdog service routine.
*/
<font color='#997700'>@@ -72,14 +77,16 @@
</font> void *
);
<font color='#880000'>-/** @brief No timeout constant
</font><font color='#000088'>+/**
+ * @brief No timeout constant
</font> *
* This is the constant for indefinite wait. It is actually an
* illegal interval.
*/
#define WATCHDOG_NO_TIMEOUT 0
<font color='#880000'>-/** @brief Watchdog States Type
</font><font color='#000088'>+/**
+ * @brief Watchdog States Type
</font> *
* This enumerated type is the set of the states in which a
* watchdog timer may be at any given time.
<font color='#997700'>@@ -100,7 +107,8 @@
</font> WATCHDOG_REMOVE_IT
} Watchdog_States;
<font color='#880000'>-/** @brief Watchdog Adjustment Directions Type
</font><font color='#000088'>+/**
+ * @brief Watchdog Adjustment Directions Type
</font> *
* The following enumerated type details the manner in which
* a watchdog chain may be adjusted by the @ref _Watchdog_Adjust
<font color='#997700'>@@ -114,7 +122,8 @@
</font> WATCHDOG_BACKWARD
} Watchdog_Adjust_directions;
<font color='#880000'>-/** @brief Watchdog Control Structure
</font><font color='#000088'>+/**
+ * @brief Watchdog Control Structure
</font> *
* The following record defines the control block used
* to manage each watchdog timer.
<font color='#997700'>@@ -144,28 +153,32 @@
</font> void *user_data;
} Watchdog_Control;
<font color='#880000'>-/** @brief Watchdog Synchronization Level
</font><font color='#000088'>+/**
+ * @brief Watchdog Synchronization Level
</font> *
* This used for synchronization purposes
* during an insert on a watchdog delta chain.
*/
SCORE_EXTERN volatile uint32_t _Watchdog_Sync_level;
<font color='#880000'>-/** @brief Watchdog Synchronization Count
</font><font color='#000088'>+/**
+ * @brief Watchdog Synchronization Count
</font> *
* This used for synchronization purposes
* during an insert on a watchdog delta chain.
*/
SCORE_EXTERN volatile uint32_t _Watchdog_Sync_count;
<font color='#880000'>-/** @brief Ticks Since System Boot
</font><font color='#000088'>+/**
+ * @brief Ticks Since System Boot
</font> *
* This contains the number of ticks since the system was booted.
*/
SCORE_EXTERN volatile Watchdog_Interval _Watchdog_Ticks_since_boot;
<font color='#880000'>-/** @brief Watchdog Nanoseconds Since Last Tick Handler
</font><font color='#000088'>+/**
+ * @brief Watchdog Nanoseconds Since Last Tick Handler
</font> *
* This is a pointer to the optional BSP plugin to obtain the number
* of nanoseconds since the last clock tick.
<font color='#997700'>@@ -173,19 +186,22 @@
</font> extern Watchdog_Nanoseconds_since_last_tick_routine
_Watchdog_Nanoseconds_since_tick_handler;
<font color='#880000'>-/** @brief Per Ticks Watchdog List
</font><font color='#000088'>+/**
+ * @brief Per Ticks Watchdog List
</font> *
* This is the watchdog chain which is managed at ticks.
*/
SCORE_EXTERN Chain_Control _Watchdog_Ticks_chain;
<font color='#880000'>-/** @brief Per Seconds Watchdog List
</font><font color='#000088'>+/**
+ * @brief Per Seconds Watchdog List
</font> *
* This is the watchdog chain which is managed at second boundaries.
*/
SCORE_EXTERN Chain_Control _Watchdog_Seconds_chain;
<font color='#880000'>-/** @brief Watchdog Handler Initialization
</font><font color='#000088'>+/**
+ * @brief Watchdog Handler Initialization
</font> *
* This routine initializes the watchdog handler. The watchdog
* synchronization flag is initialized and the watchdog chains are
<font color='#997700'>@@ -193,7 +209,8 @@
</font> */
void _Watchdog_Handler_initialization( void );
<font color='#880000'>-/** @brief Remove Watchdog from List
</font><font color='#000088'>+/**
+ * @brief Remove Watchdog from List
</font> *
* This routine removes @a the_watchdog from the watchdog chain on which
* it resides and returns the state @a the_watchdog timer was in.
<font color='#997700'>@@ -205,7 +222,8 @@
</font> Watchdog_Control *the_watchdog
);
<font color='#880000'>-/** @brief Watchdog Adjust
</font><font color='#000088'>+/**
+ * @brief Watchdog Adjust
</font> *
* This routine adjusts the @a header watchdog chain in the forward
* or backward @a direction for @a units ticks.
<font color='#997700'>@@ -220,7 +238,8 @@
</font> Watchdog_Interval units
);
<font color='#880000'>-/** @brief Watchdog Adjust to Chain
</font><font color='#000088'>+/**
+ * @brief Watchdog Adjust to Chain
</font> *
* This routine adjusts the @a header watchdog chain in the forward
* @a direction for @a units_arg ticks.
<font color='#997700'>@@ -239,7 +258,8 @@
</font>
);
<font color='#880000'>-/** @brief Watchdog Insert
</font><font color='#000088'>+/**
+ * @brief Watchdog Insert
</font> *
* This routine inserts @a the_watchdog into the @a header watchdog chain
* for a time of @a units.
<font color='#997700'>@@ -252,7 +272,8 @@
</font> Watchdog_Control *the_watchdog
);
<font color='#880000'>-/** @brief Watchdog Tickle
</font><font color='#000088'>+/**
+ * @brief Watchdog Tickle
</font> *
* This routine is invoked at appropriate intervals to update
* the @a header watchdog chain.
<font color='#006600'>diff -u rtems/cpukit/score/include/rtems/score/wkspace.h:1.31 rtems/cpukit/score/include/rtems/score/wkspace.h:1.32
--- rtems/cpukit/score/include/rtems/score/wkspace.h:1.31 Tue Feb 15 18:24:49 2011
+++ rtems/cpukit/score/include/rtems/score/wkspace.h Fri Jun 17 09:55:27 2011
</font><font color='#997700'>@@ -7,7 +7,7 @@
</font> */
/*
<font color='#880000'>- * COPYRIGHT (c) 1989-2008.
</font><font color='#000088'>+ * COPYRIGHT (c) 1989-2009.
</font> * On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
<font color='#997700'>@@ -35,20 +35,23 @@
</font> #include <rtems/score/heap.h>
#include <rtems/score/interr.h>
<font color='#880000'>-/** @brief Executive Workspace Control
</font><font color='#000088'>+/**
+ * @brief Executive Workspace Control
</font> *
* The is the heap control structure that used to manage the
* RTEMS Executive Workspace.
*/
SCORE_EXTERN Heap_Control _Workspace_Area; /* executive heap header */
<font color='#880000'>-/** @brief Workspace Handler Initialization
</font><font color='#000088'>+/**
+ * @brief Workspace Handler Initialization
</font> *
* This routine performs the initialization necessary for this handler.
*/
void _Workspace_Handler_initialization(void);
<font color='#880000'>-/** @brief Allocate Memory from Workspace
</font><font color='#000088'>+/**
+ * @brief Allocate Memory from Workspace
</font> *
* This routine returns the address of a block of memory of size
* bytes. If a block of the appropriate size cannot be allocated
<font color='#997700'>@@ -62,7 +65,8 @@
</font> size_t size
);
<font color='#880000'>-/** @brief Free Memory to the Workspace
</font><font color='#000088'>+/**
+ * @brief Free Memory to the Workspace
</font> *
* This function frees the specified block of memory. If the block
* belongs to the Workspace and can be successfully freed, then
<font color='#997700'>@@ -79,7 +83,8 @@
</font> void *block
);
<font color='#880000'>-/** @brief Workspace Allocate or Fail with Fatal Error
</font><font color='#000088'>+/**
+ * @brief Workspace Allocate or Fail with Fatal Error
</font> *
* This routine returns the address of a block of memory of @a size
* bytes. If a block of the appropriate size cannot be allocated
</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>