score: Relax _Scheduler_Set() restrictions

No longer unconditionally prevent scheduler changes if the thread owns
resources.  Prevent a scheduler change only in case other threads wait
for the resource.

cpukit/score/include/rtems/score/schedulerimpl.h

@@ -1214,10 +1214,7 @@ RTEMS_INLINE_ROUTINE Status_Control _Scheduler_Set(
   Scheduler_Node *new_scheduler_node;
   Scheduler_Node *old_scheduler_node;
 
-  if (
+  if ( the_thread->Wait.queue != NULL ) {
-    _Thread_Owns_resources( the_thread )
-      || the_thread->Wait.queue != NULL
-  ) {
     return STATUS_RESOURCE_IN_USE;
   }
 
@@ -1237,6 +1234,10 @@ RTEMS_INLINE_ROUTINE Status_Control _Scheduler_Set(
   }
 
 #if defined(RTEMS_SMP)
+  if ( !_Chain_Has_only_one_node( &the_thread->Scheduler.Wait_nodes ) ) {
+    return STATUS_RESOURCE_IN_USE;
+  }
+
   _Thread_Scheduler_process_requests( the_thread );
   new_scheduler_node = _Thread_Scheduler_get_node_by_index(
     the_thread,

testsuites/smptests/smpscheduler02/init.c

@@ -25,8 +25,6 @@
 
 const char rtems_test_name[] = "SMPSCHEDULER 2";
 
-#if defined(__RTEMS_HAVE_SYS_CPUSET_H__)
-
 #define SCHED_A rtems_build_name(' ', ' ', ' ', 'A')
 
 #define SCHED_B rtems_build_name(' ', ' ', ' ', 'B')
@@ -35,7 +33,9 @@ const char rtems_test_name[] = "SMPSCHEDULER 2";
 
 static rtems_id main_task_id;
 
-static rtems_id sema_id;
+static rtems_id cmtx_id;
+
+static rtems_id imtx_id;
 
 static void task(rtems_task_argument arg)
 {
@@ -47,12 +47,21 @@ static void task(rtems_task_argument arg)
   rtems_test_assert(sched_get_priority_min(SCHED_RR) == 1);
   rtems_test_assert(sched_get_priority_max(SCHED_RR) == 126);
 
-  sc = rtems_semaphore_obtain(sema_id, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+  sc = rtems_semaphore_obtain(cmtx_id, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
   rtems_test_assert(sc == RTEMS_NOT_DEFINED);
 
   sc = rtems_event_transient_send(main_task_id);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
+  sc = rtems_semaphore_obtain(imtx_id, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  sc = rtems_semaphore_release(imtx_id);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  sc = rtems_event_transient_send(main_task_id);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
   while (1) {
     /* Do nothing */
   }
@@ -102,22 +111,31 @@ static void test(void)
   rtems_test_assert(sc == RTEMS_UNSATISFIED);
 
   sc = rtems_semaphore_create(
-    SCHED_A,
+    rtems_build_name('C', 'M', 'T', 'X'),
     1,
     RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_PRIORITY_CEILING,
     1,
-    &sema_id
+    &cmtx_id
+  );
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  sc = rtems_semaphore_create(
+    rtems_build_name('I', 'M', 'T', 'X'),
+    1,
+    RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_INHERIT_PRIORITY,
+    1,
+    &imtx_id
   );
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
   prio = 2;
-  sc = rtems_semaphore_set_priority(sema_id, scheduler_a_id, prio, &prio);
+  sc = rtems_semaphore_set_priority(cmtx_id, scheduler_a_id, prio, &prio);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
   rtems_test_assert(prio == 1);
 
   if (cpu_count > 1) {
     prio = 1;
-    sc = rtems_semaphore_set_priority(sema_id, scheduler_b_id, prio, &prio);
+    sc = rtems_semaphore_set_priority(cmtx_id, scheduler_b_id, prio, &prio);
     rtems_test_assert(sc == RTEMS_NOT_DEFINED);
     rtems_test_assert(prio == 2);
   }
@@ -197,6 +215,9 @@ static void test(void)
     rtems_test_assert(sc == RTEMS_SUCCESSFUL);
     rtems_test_assert(scheduler_id == scheduler_b_id);
 
+    sc = rtems_semaphore_obtain(imtx_id, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
     sc = rtems_task_start(task_id, task, 0);
     rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
@@ -205,24 +226,27 @@ static void test(void)
 
     sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT);
     rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+    sc = rtems_task_set_scheduler(RTEMS_SELF, scheduler_b_id, 1);
+    rtems_test_assert(sc == RTEMS_RESOURCE_IN_USE);
+
+    sc = rtems_semaphore_release(imtx_id);
+    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+    sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
   }
 
   sc = rtems_task_delete(task_id);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
-  sc = rtems_semaphore_delete(sema_id);
+  sc = rtems_semaphore_delete(cmtx_id);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  sc = rtems_semaphore_delete(imtx_id);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 }
 
-#else /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */
-
-static void test(void)
-{
-  /* Nothing to do */
-}
-
-#endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */
-
 static void Init(rtems_task_argument arg)
 {
   rtems_resource_snapshot snapshot;
@@ -243,7 +267,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
 #define CONFIGURE_MAXIMUM_TASKS 2
-#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+#define CONFIGURE_MAXIMUM_SEMAPHORES 2
 
 #define CONFIGURE_SMP_APPLICATION
 

testsuites/sptests/spscheduler01/init.c

@@ -236,7 +236,7 @@ static void test_task_get_set_scheduler(void)
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
   sc = rtems_task_set_scheduler(self_id, scheduler_id, 1);
-  rtems_test_assert(sc == RTEMS_RESOURCE_IN_USE);
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
 
   sc = rtems_semaphore_release(mtx_id);
   rtems_test_assert(sc == RTEMS_SUCCESSFUL);