Changeset 1c95d94 in rtems


Ignore:
Timestamp:
Apr 21, 2011, 7:05:34 PM (9 years ago)
Author:
Jennifer Averett <Jennifer.Averett@…>
Branches:
4.11, master
Children:
469a993
Parents:
d7c3883
Message:

2011-04-21 Jennifer Averett <Jennifer.Averett@…

PR 1777/cpukit

  • support/include/tmacros.h, tmtests/tm26/task1.c, tmtests/tm27/task1.c: Consolidated access to _Thread_Dispatch_disable_level.
Location:
testsuites
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • testsuites/ChangeLog

    rd7c3883 r1c95d94  
     12011-04-21      Jennifer Averett <Jennifer.Averett@OARcorp.com
     2
     3        PR 1777/cpukit
     4        * support/include/tmacros.h, tmtests/tm26/task1.c,
     5        tmtests/tm27/task1.c: Consolidated access to
     6        _Thread_Dispatch_disable_level.
     7
    182011-04-20      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • testsuites/support/include/tmacros.h

    rd7c3883 r1c95d94  
    2626#include <rtems/error.h>
    2727#include <rtems/score/thread.h> /*  _Thread_Dispatch_disable_level */
     28#include <rtems/score/thread.inl> /*  _Thread_Dispatch_disable_level */
    2829
    2930#ifdef __cplusplus
     
    4950  do { \
    5051    if ( (_expect) != -1 \
    51            && ((_Thread_Dispatch_disable_level == 0 && (_expect) != 0) \
    52              || (_Thread_Dispatch_disable_level != 0 && (_expect) == 0)) \
     52           && ((_Thread_Dispatch_in_critical_section() == false && (_expect) != 0) \
     53             || (_Thread_Dispatch_in_critical_section() && (_expect) == 0)) \
    5354    ) { \
    5455      printk( \
    5556        "\n_Thread_Dispatch_disable_level is (%" PRId32 \
    5657           ") not %d detected at %s:%d\n", \
    57          _Thread_Dispatch_disable_level, (_expect), __FILE__, __LINE__ ); \
     58         _Thread_Dispatch_get_disable_level(), (_expect), __FILE__, __LINE__ ); \
    5859      FLUSH_OUTPUT(); \
    5960      rtems_test_exit( 1 ); \
  • testsuites/tmtests/tm26/task1.c

    rd7c3883 r1c95d94  
    454454  _Thread_Heir = _Thread_Executing;
    455455  _Thread_Dispatch_necessary = false;
    456   _Thread_Dispatch_disable_level = 0;
     456 
     457  _Thread_Dispatch_set_disable_level( 0 );
    457458
    458459  /*
  • testsuites/tmtests/tm27/task1.c

    rd7c3883 r1c95d94  
    112112  Interrupt_nest = 0;
    113113
    114   _Thread_Dispatch_disable_level = 0;
     114  _Thread_Dispatch_set_disable_level( 0 );
    115115
    116116  Interrupt_occurred = 0;
     
    145145   */
    146146
    147   _Thread_Dispatch_disable_level = 1;
     147  _Thread_Dispatch_set_disable_level( 1 );
    148148
    149149  Interrupt_nest = 1;
     
    159159  Interrupt_return_time = benchmark_timer_read();
    160160
    161   _Thread_Dispatch_disable_level = 0;
     161  _Thread_Dispatch_set_disable_level( 0 );
    162162
    163163  put_time(
     
    181181   */
    182182
    183   _Thread_Dispatch_disable_level = 0;
     183  _Thread_Dispatch_set_disable_level( 0 );
    184184
    185185  ready_queues      = (Chain_Control *) _Scheduler.information;
     
    242242   */
    243243
    244   _Thread_Dispatch_disable_level = 0;
     244  _Thread_Dispatch_set_disable_level( 0 );
    245245
    246246  ready_queues      = (Chain_Control *) _Scheduler.information;
Note: See TracChangeset for help on using the changeset viewer.