Ticket #271: pr271a.diff

ChangeLog

@@ +1 @@
+2000-09-29      Stephan Merker <merker@decrc.abb.de>
+
+        * include/rtems/rtems/ratemon.h, src/ratemonperiod.c,
+        src/ratemontimeout.c: Add next_length field so period length
+        can be changed by the the sequence period(X), period(not X)
+        with no intervening cancel or expiration.
+
 2000-09-04      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
         * optman/Makefile.am, src/Makefile.am: Include compile.am.

include/rtems/rtems/ratemon.h

@@ -19 +19 @@
  *  found in the file LICENSE in this distribution or at
  *  http://www.OARcorp.com/rtems/license.html.
  *
- *  $Id: ratemon.h,v 1.14 1999/11/17 17:50:24 joel Exp $
+ *  $Id: ratemon.h,v 1.15 2000/09/29 14:48:17 joel Exp $
  */
 
 #ifndef __RTEMS_RATE_MONOTONIC_h
@@ -76 +76 @@
   rtems_rate_monotonic_period_states  state;
   unsigned32                          owner_ticks_executed_at_period;
   unsigned32                          time_at_period;
+  unsigned32                          next_length;
   Thread_Control                     *owner;
 }   Rate_monotonic_Control;
 

src/ratemontimeout.c

@@ -9 +9 @@
  *  found in the file LICENSE in this distribution or at
  *  http://www.OARcorp.com/rtems/license.html.
  *
- *  $Id: ratemontimeout.c,v 1.2 1999/11/17 17:50:27 joel Exp $
+ *  $Id: ratemontimeout.c,v 1.3 2000/09/29 14:48:17 joel Exp $
  */
 
 #include <rtems/system.h>
@@ -44 +44 @@
   Objects_Locations       location;
   Thread_Control         *the_thread;
 
+  /*
+   *  When we get here, the Timer is already off the chain so we do not
+   *  have to worry about that -- hence no _Watchdog_Remove().
+   */
+
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
     case OBJECTS_REMOTE:  /* impossible */
@@ -60 +65 @@
 
         the_period->time_at_period = _Watchdog_Ticks_since_boot;
 
-        _Watchdog_Reset( &the_period->Timer );
+        _Watchdog_Insert_ticks( &the_period->Timer, the_period->next_length );
       } else if ( the_period->state == RATE_MONOTONIC_OWNER_IS_BLOCKING ) {
         the_period->state = RATE_MONOTONIC_EXPIRED_WHILE_BLOCKING;
         the_period->owner_ticks_executed_at_period =
           the_thread->ticks_executed;
 
         the_period->time_at_period = _Watchdog_Ticks_since_boot;
-        _Watchdog_Reset( &the_period->Timer );
+        _Watchdog_Insert_ticks( &the_period->Timer, the_period->next_length );
       } else
         the_period->state = RATE_MONOTONIC_EXPIRED;
       _Thread_Unnest_dispatch();