Changeset d057d653 in rtems

Timestamp:

Sep 30, 2016, 8:10:22 AM (4 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

d097b546

Parents:

fac8a3a

git-author:

Sebastian Huber <sebastian.huber@…> (09/30/16 08:10:22)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/02/16 09:05:40)

Message:

score: Fix _Scheduler_Try_to_schedule_node() usage

Fix wrong use of continue statement in while loops.

File:

• cpukit/score/include/rtems/score/schedulersmpimpl.h (modified) (4 diffs)

cpukit/score/include/rtems/score/schedulersmpimpl.h

@@ -715 +715 @@
 )
 {
-  Thread_Control *needs_help;
-
-  do {
-    Scheduler_Node *highest_ready = ( *get_highest_ready )( context, node );
+  while ( true ) {
+    Scheduler_Node                   *highest_ready;
+    Scheduler_Try_to_schedule_action  action;
+
+    highest_ready = ( *get_highest_ready )( context, node );
 
     /*
@@ -726 +727 @@
     if ( ( *order )( &node->Node, &highest_ready->Node ) ) {
       ( *insert_scheduled )( context, node );
-
-      needs_help = NULL;
-    } else {
-      Scheduler_Try_to_schedule_action action;
-
-      action = _Scheduler_Try_to_schedule_node(
+      return NULL;
+    }
+
+    action = _Scheduler_Try_to_schedule_node(
+      context,
+      highest_ready,
+      _Scheduler_Node_get_idle( node ),
+      _Scheduler_SMP_Get_idle_thread
+    );
+
+    if ( action == SCHEDULER_TRY_TO_SCHEDULE_DO_SCHEDULE ) {
+      Thread_Control *user = _Scheduler_Node_get_user( node );
+      Thread_Control *idle;
+
+      _Scheduler_SMP_Node_change_state(
+        _Scheduler_SMP_Node_downcast( node ),
+        SCHEDULER_SMP_NODE_READY
+      );
+      _Scheduler_Thread_change_state( user, THREAD_SCHEDULER_READY );
+
+      _Scheduler_SMP_Allocate_processor(
         context,
         highest_ready,
-        _Scheduler_Node_get_idle( node ),
-        _Scheduler_SMP_Get_idle_thread
-      );
-
-      if ( action == SCHEDULER_TRY_TO_SCHEDULE_DO_SCHEDULE ) {
-        Thread_Control *user = _Scheduler_Node_get_user( node );
-        Thread_Control *idle;
-
-        _Scheduler_SMP_Node_change_state(
-          _Scheduler_SMP_Node_downcast( node ),
-          SCHEDULER_SMP_NODE_READY
-        );
-        _Scheduler_Thread_change_state( user, THREAD_SCHEDULER_READY );
-
-        _Scheduler_SMP_Allocate_processor(
-          context,
-          highest_ready,
-          node,
-          allocate_processor
-        );
-
-        ( *insert_ready )( context, node );
-        ( *move_from_ready_to_scheduled )( context, highest_ready );
-
-        idle = _Scheduler_Release_idle_thread(
-          context,
-          node,
-          _Scheduler_SMP_Release_idle_thread
-        );
-        if ( idle == NULL ) {
-          needs_help = user;
-        } else {
-          needs_help = NULL;
-        }
-      } else if ( action == SCHEDULER_TRY_TO_SCHEDULE_DO_IDLE_EXCHANGE ) {
-        _Scheduler_SMP_Node_change_state(
-          _Scheduler_SMP_Node_downcast( node ),
-          SCHEDULER_SMP_NODE_READY
-        );
-        _Scheduler_SMP_Node_change_state(
-          _Scheduler_SMP_Node_downcast( highest_ready ),
-          SCHEDULER_SMP_NODE_SCHEDULED
-        );
-
-        ( *insert_ready )( context, node );
-        ( *move_from_ready_to_scheduled )( context, highest_ready );
-
-        _Scheduler_Exchange_idle_thread(
-          highest_ready,
-          node,
-          _Scheduler_Node_get_idle( node )
-        );
-
-        needs_help = NULL;
+        node,
+        allocate_processor
+      );
+
+      ( *insert_ready )( context, node );
+      ( *move_from_ready_to_scheduled )( context, highest_ready );
+
+      idle = _Scheduler_Release_idle_thread(
+        context,
+        node,
+        _Scheduler_SMP_Release_idle_thread
+      );
+
+      if ( idle == NULL ) {
+        return user;
       } else {
-        _Assert( action == SCHEDULER_TRY_TO_SCHEDULE_DO_BLOCK );
-
-        _Scheduler_SMP_Node_change_state(
-          _Scheduler_SMP_Node_downcast( highest_ready ),
-          SCHEDULER_SMP_NODE_BLOCKED
-        );
-
-        ( *extract_from_ready )( context, highest_ready );
-
-        continue;
+        return NULL;
       }
+    } else if ( action == SCHEDULER_TRY_TO_SCHEDULE_DO_IDLE_EXCHANGE ) {
+      _Scheduler_SMP_Node_change_state(
+        _Scheduler_SMP_Node_downcast( node ),
+        SCHEDULER_SMP_NODE_READY
+      );
+      _Scheduler_SMP_Node_change_state(
+        _Scheduler_SMP_Node_downcast( highest_ready ),
+        SCHEDULER_SMP_NODE_SCHEDULED
+      );
+
+      ( *insert_ready )( context, node );
+      ( *move_from_ready_to_scheduled )( context, highest_ready );
+
+      _Scheduler_Exchange_idle_thread(
+        highest_ready,
+        node,
+        _Scheduler_Node_get_idle( node )
+      );
+      return NULL;
+    } else {
+      _Assert( action == SCHEDULER_TRY_TO_SCHEDULE_DO_BLOCK );
+
+      _Scheduler_SMP_Node_change_state(
+        _Scheduler_SMP_Node_downcast( highest_ready ),
+        SCHEDULER_SMP_NODE_BLOCKED
+      );
+
+      ( *extract_from_ready )( context, highest_ready );
     }
-  } while ( false );
-
-  return needs_help;
+  }
 }
 
@@ -822 +816 @@
 )
 {
+  Scheduler_Try_to_schedule_action action;
+
   do {
     Scheduler_Node *highest_ready = ( *get_highest_ready )( context, victim );
-    Scheduler_Try_to_schedule_action action;
 
     action = _Scheduler_Try_to_schedule_node(
@@ -851 +846 @@
 
       ( *extract_from_ready )( context, highest_ready );
-
-      continue;
     }
-  } while ( false );
+  } while ( action == SCHEDULER_TRY_TO_SCHEDULE_DO_BLOCK );
 }