Ticket #1582: threadevalmode.diff

Makefile.am

@@ -141 +141 @@
 ## THREAD_C_FILES
 libscore_a_SOURCES += src/thread.c src/threadchangepriority.c \
     src/threadclearstate.c src/threadclose.c src/threadcreateidle.c \
-    src/threaddelayended.c src/threaddispatch.c src/threadevaluatemode.c \
+    src/threaddelayended.c src/threaddispatch.c \
     src/threadget.c src/threadhandler.c src/threadinitialize.c \
     src/threadloadenv.c src/threadready.c src/threadresettimeslice.c \
     src/threadreset.c src/threadrestart.c src/threadresume.c \

include/rtems/score/thread.h

@@ -759 +759 @@
   bool              force
 );
 
-/**
- *  This routine evaluates the current scheduling information for the
- *  system and determines if a context switch is required.  This
- *  is usually called after changing an execution mode such as preemptability
- *  for a thread.
- */
-bool _Thread_Evaluate_mode( void );
-
 #if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE)
 /**
  *  This routine is the body of the system idle thread.

inline/rtems/score/thread.inl

@@ -332 +332 @@
   _Thread_libc_reent = libc_reent;
 }
 
+/**
+ *  This routine evaluates the current scheduling information for the
+ *  system and determines if a context switch is required.  This
+ *  is usually called after changing an execution mode such as preemptability
+ *  for a thread.
+ */
+RTEMS_INLINE_ROUTINE bool _Thread_Evaluate_mode( void )
+{
+  Thread_Control     *executing;
+
+  executing = _Thread_Executing;
+
+  if ( !_States_Is_ready( executing->current_state ) ||
+       ( !_Thread_Is_heir( executing ) && executing->is_preemptible ) ) {
+    _Context_Switch_necessary = true;
+    return true;
+  }
+
+  return false;
+}
+
 /**@}*/
 
 #endif