Changeset 333f9426 in rtems

Timestamp:

07/10/14 10:49:43 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

27783f6

Parents:

76ad756c

git-author:

Sebastian Huber <sebastian.huber@…> (07/10/14 10:49:43)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/10/14 13:29:57)

Message:

score: Fix assertions

Location:

cpukit/score

Files:

• include/rtems/score/schedulerpriorityimpl.h (modified) (1 diff)
• include/rtems/score/schedulersmpimpl.h (modified) (2 diffs)
• src/schedulersimplesmp.c (modified) (1 diff)

cpukit/score/include/rtems/score/schedulerpriorityimpl.h

@@ -162 +162 @@
 {
   Priority_Control index = _Priority_bit_map_Get_highest( bit_map );
-
-  return _Chain_First( &ready_queues[ index ] );
+  Chain_Node *first = _Chain_First( &ready_queues[ index ] );
+
+  _Assert( first != _Chain_Tail( &ready_queues[ index ] ) );
+
+  return first;
 }
 

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

@@ -679 +679 @@
     Scheduler_Node *highest_ready = ( *get_highest_ready )( context, node );
 
-    _Assert( highest_ready != NULL );
-
     /*
      * The node has been extracted from the scheduled chain.  We have to place
@@ -761 +759 @@
   while ( true ) {
     Scheduler_Node *highest_ready = ( *get_highest_ready )( context, victim );
-
-    _Assert( highest_ready != NULL );
 
     if (

cpukit/score/src/schedulersimplesmp.c

@@ -85 +85 @@
   Scheduler_simple_SMP_Context *self =
     _Scheduler_simple_SMP_Get_self( context );
+  Scheduler_Node *first = (Scheduler_Node *) _Chain_First( &self->Ready );
 
   (void) node;
 
-  return (Scheduler_Node *) _Chain_First( &self->Ready );
+  _Assert( &first->Node != _Chain_Tail( &self->Ready ) );
+
+  return first;
 }