Changeset 79569ae in rtems


Ignore:
Timestamp:
Nov 26, 2014, 9:00:13 AM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
5bd822a7
Parents:
cbc433c7
git-author:
Sebastian Huber <sebastian.huber@…> (11/26/14 09:00:13)
git-committer:
Sebastian Huber <sebastian.huber@…> (11/27/14 09:33:31)
Message:

smp: Fix scheduler helping protocol assertions

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/include/rtems/score/schedulersmpimpl.h

    rcbc433c7 r79569ae  
    843843
    844844  if ( unblock ) {
    845     if ( node->state != SCHEDULER_SMP_NODE_READY ) {
     845    if ( node->state == SCHEDULER_SMP_NODE_BLOCKED ) {
    846846      _Scheduler_SMP_Node_change_state( node, SCHEDULER_SMP_NODE_READY );
    847847
     
    849849    } else {
    850850      _Assert( node->state == SCHEDULER_SMP_NODE_READY );
     851      _Assert(
     852        node->Base.help_state == SCHEDULER_HELP_ACTIVE_OWNER
     853          || node->Base.help_state == SCHEDULER_HELP_ACTIVE_RIVAL
     854      );
    851855      _Assert( node->Base.idle == NULL );
    852856
    853857      if ( node->Base.accepts_help == thread ) {
    854         _Assert( node->Base.help_state == SCHEDULER_HELP_ACTIVE_OWNER );
    855858        needs_help = thread;
    856859      } else {
    857         _Assert( node->Base.help_state == SCHEDULER_HELP_ACTIVE_RIVAL );
    858860        needs_help = NULL;
    859861      }
Note: See TracChangeset for help on using the changeset viewer.