Ticket #1895: pluggable_scheduler.diff

cpukit/rtems/src/ratemoncancel.c

@@ -53 +53 @@
       }
       (void) _Watchdog_Remove( &the_period->Timer );
       the_period->state = RATE_MONOTONIC_INACTIVE;
+      _Scheduler_Release_job(the_period->owner, 0);
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
 

cpukit/rtems/src/ratemondelete.c

@@ -51 +51 @@
       (void) _Watchdog_Remove( &the_period->Timer );
       the_period->state = RATE_MONOTONIC_INACTIVE;
       _Rate_monotonic_Free( the_period );
+      _Scheduler_Release_job(the_period->owner, 0);
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
 

cpukit/rtems/src/ratemonperiod.c

@@ -143 +143 @@
       _Timespec_Add_to( &the_period->cpu_usage_period_initiated, &ran );
     }
   #endif
+
+  _Scheduler_Release_job(the_period->owner, the_period->next_length);
 }
 
 void _Rate_monotonic_Update_statistics(
@@ -282 +284 @@
       if ( the_period->state == RATE_MONOTONIC_INACTIVE ) {
         _ISR_Enable( level );
 
+        the_period->next_length = length;
+
         /*
          *  Baseline statistics information for the beginning of a period.
          */
@@ -295 +299 @@
           NULL
         );
 
-        the_period->next_length = length;
-
         _Watchdog_Insert_ticks( &the_period->Timer, length );
         _Thread_Enable_dispatch();
         return RTEMS_SUCCESSFUL;
@@ -353 +355 @@
         the_period->next_length = length;
 
         _Watchdog_Insert_ticks( &the_period->Timer, length );
+        _Scheduler_Release_job(the_period->owner, the_period->next_length);
         _Thread_Enable_dispatch();
         return RTEMS_TIMEOUT;
       }

cpukit/score/Makefile.am

@@ -203 +203 @@
     src/schedulerpriorityenqueuefirst.c \
     src/schedulerpriorityextract.c \
     src/schedulerpriorityfree.c \
+    src/schedulerpriorityprioritycompare.c \
+    src/schedulerpriorityreleasejob.c \
     src/schedulerpriorityschedule.c \
     src/schedulerpriorityunblock.c \
     src/schedulerpriorityupdate.c \

cpukit/score/include/rtems/score/scheduler.h

@@ -77 +77 @@
   /** extract a thread from the ready set */
   void ( *extract )(Thread_Control *);
 
+  /**
+   * Compares two priorities (returns 1 for higher priority, 0 for equal
+   * and -1 for lower priority).
+   */
+  int ( *priority_compare )(Priority_Control, Priority_Control);
+
+  /** This routine is called upon release of a new job. */
+  void ( *release_job ) (Thread_Control *, uint32_t);
+
   /** perform scheduler update actions required at each clock tick */
   void ( *tick )(void);
+
 } Scheduler_Operations;
 
 /**
@@ -107 +117 @@
 extern Scheduler_Control  _Scheduler;
 
 /**
+ * Macro testing whether @a p1 has lower priority than @a p2
+ * in the intuitive sense of priority.
+ */
+#define _Scheduler_Is_priority_lower_than( _p1, _p2 ) \
+  (_Scheduler_Priority_compare(_p1,_p2) == -1)
+
+/**
+ * Macro testing whether @a p1 has higher priority than @a p2
+ * in the intuitive sense of priority.
+ */
+#define _Scheduler_Is_priority_higher_than( _p1, _p2 ) \
+  (_Scheduler_Priority_compare(_p1,_p2) == 1)
+
+/**
  *  This routine initializes the scheduler to the policy chosen by the user
  *  through confdefs, or to the priority scheduler with ready chains by
  *  default.

cpukit/score/include/rtems/score/schedulerpriority.h

@@ -38 +38 @@
  */
 #define SCHEDULER_PRIORITY_ENTRY_POINTS \
   { \
-    _Scheduler_priority_Initialize,    /* initialize entry point */ \
-    _Scheduler_priority_Schedule,      /* schedule entry point */ \
-    _Scheduler_priority_Yield,         /* yield entry point */ \
-    _Scheduler_priority_Block,         /* block entry point */ \
-    _Scheduler_priority_Unblock,       /* unblock entry point */ \
-    _Scheduler_priority_Allocate,      /* allocate entry point */ \
-    _Scheduler_priority_Free,          /* free entry point */ \
-    _Scheduler_priority_Update,        /* update entry point */ \
-    _Scheduler_priority_Enqueue,       /* enqueue entry point */ \
-    _Scheduler_priority_Enqueue_first, /* enqueue_first entry point */ \
-    _Scheduler_priority_Extract,       /* extract entry point */ \
-    _Scheduler_priority_Tick           /* tick entry point */ \
+    _Scheduler_priority_Initialize,       /* initialize entry point */ \
+    _Scheduler_priority_Schedule,         /* schedule entry point */ \
+    _Scheduler_priority_Yield,            /* yield entry point */ \
+    _Scheduler_priority_Block,            /* block entry point */ \
+    _Scheduler_priority_Unblock,          /* unblock entry point */ \
+    _Scheduler_priority_Allocate,         /* allocate entry point */ \
+    _Scheduler_priority_Free,             /* free entry point */ \
+    _Scheduler_priority_Update,           /* update entry point */ \
+    _Scheduler_priority_Enqueue,          /* enqueue entry point */ \
+    _Scheduler_priority_Enqueue_first,    /* enqueue_first entry point */ \
+    _Scheduler_priority_Extract,          /* extract entry point */ \
+    _Scheduler_priority_Priority_compare, /* compares two priorities */ \
+    _Scheduler_priority_Release_job,      /* new period of task */ \
+    _Scheduler_priority_Tick              /* tick entry point */ \
   }
 
 /**
@@ -172 +174 @@
 );
 
 /**
+ *  @brief Scheduler priority Priority compare
+ *
+ *  This routine compares two priorities.
+ */
+int _Scheduler_priority_Priority_compare(
+  Priority_Control      p1,
+  Priority_Control      p2
+);
+
+/**
+ *  @brief Scheduler priority Release job
+ *
+ *  This routine is called when a new job of task is released.
+ *
+ *  @param[in] the_thread is the owner of the job.
+ *  @param[in] deadline of the new job from now. If equal to 0,
+ *             the job was cancelled or deleted.
+ */
+void _Scheduler_priority_Release_job (
+  Thread_Control  *the_thread,
+  uint32_t         deadline
+);
+
+/**
  *  @brief Deterministic Priority Scheduler Tick Method
  *
  *  This routine is invoked as part of processing each clock tick.

cpukit/score/include/rtems/score/schedulersimple.h

@@ -35 +35 @@
  */
 #define SCHEDULER_SIMPLE_ENTRY_POINTS \
   { \
-    _Scheduler_simple_Initialize,    /* initialize entry point */ \
-    _Scheduler_simple_Schedule,      /* schedule entry point */ \
-    _Scheduler_simple_Yield,         /* yield entry point */ \
-    _Scheduler_simple_Block,         /* block entry point */ \
-    _Scheduler_simple_Unblock,       /* unblock entry point */ \
-    _Scheduler_simple_Allocate,      /* allocate entry point */ \
-    _Scheduler_simple_Free,          /* free entry point */ \
-    _Scheduler_simple_Update,        /* update entry point */ \
-    _Scheduler_simple_Enqueue,       /* enqueue entry point */ \
-    _Scheduler_simple_Enqueue_first, /* enqueue_first entry point */ \
-    _Scheduler_simple_Extract,       /* extract entry point */ \
-    _Scheduler_priority_Tick         /* tick entry point */ \
+    _Scheduler_simple_Initialize,         /* initialize entry point */ \
+    _Scheduler_simple_Schedule,           /* schedule entry point */ \
+    _Scheduler_simple_Yield,              /* yield entry point */ \
+    _Scheduler_simple_Block,              /* block entry point */ \
+    _Scheduler_simple_Unblock,            /* unblock entry point */ \
+    _Scheduler_simple_Allocate,           /* allocate entry point */ \
+    _Scheduler_simple_Free,               /* free entry point */ \
+    _Scheduler_simple_Update,             /* update entry point */ \
+    _Scheduler_simple_Enqueue,            /* enqueue entry point */ \
+    _Scheduler_simple_Enqueue_first,      /* enqueue_first entry point */ \
+    _Scheduler_simple_Extract,            /* extract entry point */ \
+    _Scheduler_priority_Priority_compare, /* compares two priorities */ \
+    _Scheduler_priority_Release_job,      /* new period of task */ \
+    _Scheduler_priority_Tick              /* tick entry point */ \
   }
 
 /**

cpukit/score/include/rtems/score/schedulersimplesmp.h

@@ -40 +40 @@
 
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulersimple.h>
+#include <rtems/score/schedulerpriority.h>
 
 /**
  *  Entry points for Scheduler Simple SMP
  */
 #define SCHEDULER_SIMPLE_SMP_ENTRY_POINTS \
   { \
-    _Scheduler_simple_Initialize,    /* initialize entry point */ \
-    _Scheduler_simple_smp_Schedule,  /* schedule entry point */ \
-    _Scheduler_simple_Yield,         /* yield entry point */ \
-    _Scheduler_simple_smp_Block,     /* block entry point */ \
-    _Scheduler_simple_smp_Unblock,   /* unblock entry point */ \
-    _Scheduler_simple_Allocate,      /* allocate entry point */ \
-    _Scheduler_simple_Free,          /* free entry point */ \
-    _Scheduler_simple_Update,        /* update entry point */ \
-    _Scheduler_simple_Enqueue,       /* enqueue entry point */ \
-    _Scheduler_simple_Enqueue_first, /* enqueue_first entry point */ \
-    _Scheduler_simple_Extract,       /* extract entry point */ \
-    _Scheduler_simple_smp_Tick       /* tick entry point */ \
+    _Scheduler_simple_Initialize,         /* initialize entry point */ \
+    _Scheduler_simple_smp_Schedule,       /* schedule entry point */ \
+    _Scheduler_simple_Yield,              /* yield entry point */ \
+    _Scheduler_simple_smp_Block,          /* block entry point */ \
+    _Scheduler_simple_smp_Unblock,        /* unblock entry point */ \
+    _Scheduler_simple_Allocate,           /* allocate entry point */ \
+    _Scheduler_simple_Free,               /* free entry point */ \
+    _Scheduler_simple_Update,             /* update entry point */ \
+    _Scheduler_simple_Enqueue,            /* enqueue entry point */ \
+    _Scheduler_simple_Enqueue_first,      /* enqueue_first entry point */ \
+    _Scheduler_simple_Extract,            /* extract entry point */ \
+    _Scheduler_priority_Priority_compare, /* compares two priorities */ \
+    _Scheduler_priority_Release_job,      /* new period of task */ \
+    _Scheduler_simple_smp_Tick            /* tick entry point */ \
   }
 
 /**

cpukit/score/inline/rtems/score/scheduler.inl

@@ -159 +159 @@
   _Scheduler.Operations.extract( the_thread );
 }
 
+/**
+ * @brief Scheduler Priority compare
+ *
+ * This routine compares two priorities.
+ */
+RTEMS_INLINE_ROUTINE int _Scheduler_Priority_compare(
+  Priority_Control p1,
+  Priority_Control p2
+)
+{
+  return _Scheduler.Operations.priority_compare(p1, p2);
+}
+
+/**
+ * @brief Scheduler Release job
+ *
+ * This routine is called when a new period of task is issued.
+ */
+RTEMS_INLINE_ROUTINE void _Scheduler_Release_job(
+  Thread_Control *the_thread,
+  uint32_t       length
+)
+{
+  _Scheduler.Operations.release_job(the_thread, length);
+}
+
 /** @brief Scheduler Method Invoked at Each Clock Tick
  *
  * This method is invoked at each clock tick to allow the scheduler

cpukit/score/inline/rtems/score/schedulerpriority.inl

@@ -185 +185 @@
   );
 }
 
+/**
+ *  @brief Scheduler priority Priority compare body
+ *
+ *  This routine implements priority comparison for priority-based
+ *  scheduling.
+ *
+ *  @return 1 for higher priority, 0 for equal and -1 for lower priority.
+ */
+RTEMS_INLINE_ROUTINE int _Scheduler_priority_Priority_compare_body(
+  Priority_Control      p1,
+  Priority_Control      p2
+)
+{
+  /* High priority in priority scheduler is represented by low numbers. */
+  return ((p1<p2) - (p1>p2));
+}
+
 /**@}*/
 
 #endif

cpukit/score/src/coremutexseize.c

@@ -60 +60 @@
 
   executing = _Thread_Executing;
   if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) ) {
-    if ( the_mutex->holder->current_priority > executing->current_priority ) {
+    if ( _Scheduler_Is_priority_higher_than(
+         executing->current_priority,
+         the_mutex->holder->current_priority)) {
       _Thread_Change_priority(
         the_mutex->holder,
         executing->current_priority,