git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3224 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 36 insertions, 38 deletions

diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index b481a0b6a..f2014b8c7 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -76,7 +76,6 @@ Thread *chSchReadyI(Thread *tp) {
   Thread *cp;

 

   /* Integrity checks.*/

-  chDbgCheckClassI();

   chDbgAssert((tp->p_state != THD_STATE_READY) &&

               (tp->p_state != THD_STATE_FINAL),

               "chSchReadyI(), #1",

@@ -116,7 +115,7 @@ void chSchGoSleepS(tstate_t newstate) {
 #endif

   setcurrp(fifo_remove(&rlist.r_queue));

   currp->p_state = THD_STATE_CURRENT;

-  chSysSwitchI(currp, otp);

+  chSysSwitch(currp, otp);

 }

 #endif /* !defined(PORT_OPTIMIZED_GOSLEEPS) */

 

@@ -228,37 +227,12 @@ void chSchWakeupS(Thread *ntp, msg_t msg) {
 #endif

     setcurrp(ntp);

     ntp->p_state = THD_STATE_CURRENT;

-    chSysSwitchI(ntp, otp);

+    chSysSwitch(ntp, otp);

   }

 }

 #endif /* !defined(PORT_OPTIMIZED_WAKEUPS) */

 

 /**

- * @brief   Switches to the first thread on the runnable queue.

- * @note    It is intended to be called if @p chSchRescRequiredI() evaluates

- *          to @p TRUE.

- *

- * @iclass

- */

-#if !defined(PORT_OPTIMIZED_DORESCHEDULEI) || defined(__DOXYGEN__)

-void chSchDoRescheduleI(void) {

-  Thread *otp;

-

-  chDbgCheckClassI();

-

-#if CH_TIME_QUANTUM > 0

-  rlist.r_preempt = CH_TIME_QUANTUM;

-#endif

-  otp = currp;

-  /* Picks the first thread from the ready queue and makes it current.*/

-  setcurrp(fifo_remove(&rlist.r_queue));

-  currp->p_state = THD_STATE_CURRENT;

-  chSchReadyI(otp);

-  chSysSwitchI(currp, otp);

-}

-#endif /* !defined(PORT_OPTIMIZED_DORESCHEDULEI) */

-

-/**

  * @brief   Performs a reschedule if a higher priority thread is runnable.

  * @details If a thread with a higher priority than the current thread is in

  *          the ready list then make the higher priority thread running.

@@ -271,24 +245,25 @@ void chSchRescheduleS(void) {
   chDbgCheckClassS();

 

   if (chSchIsRescRequiredI())

-    chSchDoRescheduleI();

+    chSchDoReschedule();

 }

 #endif /* !defined(PORT_OPTIMIZED_RESCHEDULES) */

 

 /**

- * @brief   Evaluates if a reschedule is required.

+ * @brief   Evaluates if preemption is required.

  * @details The decision is taken by comparing the relative priorities and

  *          depending on the state of the round robin timeout counter.

- * @note    This function is meant to be used in the timer interrupt handler

- *          where @p chVTDoTickI() is invoked.

+ * @note    Not a user function, it is meant to be invoked by the scheduler

+ *          itself or from within the port layer.

  *

- * @retval TRUE         if there is a thread that should go in running state.

- * @retval FALSE        if a reschedule is not required.

+ * @retval TRUE         if there is a thread that must go in running state

+ *                      immediately.

+ * @retval FALSE        if preemption is not required.

  *

- * @iclass

+ * @special

  */

-#if !defined(PORT_OPTIMIZED_ISRESCHREQUIREDEXI) || defined(__DOXYGEN__)

-bool_t chSchIsRescRequiredExI(void) {

+#if !defined(PORT_OPTIMIZED_ISPREEMPTIONREQUIRED) || defined(__DOXYGEN__)

+bool_t chSchIsPreemptionRequired(void) {

   tprio_t p1 = firstprio(&rlist.r_queue);

   tprio_t p2 = currp->p_prio;

 #if CH_TIME_QUANTUM > 0

@@ -303,6 +278,29 @@ bool_t chSchIsRescRequiredExI(void) {
   return p1 > p2;

 #endif

 }

-#endif /* !defined(PORT_OPTIMIZED_ISRESCHREQUIREDEXI) */

+#endif /* !defined(PORT_OPTIMIZED_ISPREEMPTIONREQUIRED) */

+

+/**

+ * @brief   Switches to the first thread on the runnable queue.

+ * @note    Not a user function, it is meant to be invoked by the scheduler

+ *          itself or from within the port layer.

+ *

+ * @special

+ */

+#if !defined(PORT_OPTIMIZED_DORESCHEDULE) || defined(__DOXYGEN__)

+void chSchDoReschedule(void) {

+  Thread *otp;

+

+#if CH_TIME_QUANTUM > 0

+  rlist.r_preempt = CH_TIME_QUANTUM;

+#endif

+  otp = currp;

+  /* Picks the first thread from the ready queue and makes it current.*/

+  setcurrp(fifo_remove(&rlist.r_queue));

+  currp->p_state = THD_STATE_CURRENT;

+  chSchReadyI(otp);

+  chSysSwitch(currp, otp);

+}

+#endif /* !defined(PORT_OPTIMIZED_DORESCHEDULE) */

 

 /** @} */