Changeset 1c95d94 in rtems for testsuites/support

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.

File:

• testsuites/support/include/tmacros.h (modified) (2 diffs)

testsuites/support/include/tmacros.h

@@ -26 +26 @@
 #include <rtems/error.h>
 #include <rtems/score/thread.h> /*  _Thread_Dispatch_disable_level */
+#include <rtems/score/thread.inl> /*  _Thread_Dispatch_disable_level */
 
 #ifdef __cplusplus
@@ -49 +50 @@
   do { \
     if ( (_expect) != -1 \
-           && ((_Thread_Dispatch_disable_level == 0 && (_expect) != 0) \
-             || (_Thread_Dispatch_disable_level != 0 && (_expect) == 0)) \
+           && ((_Thread_Dispatch_in_critical_section() == false && (_expect) != 0) \
+             || (_Thread_Dispatch_in_critical_section() && (_expect) == 0)) \
     ) { \
       printk( \
         "\n_Thread_Dispatch_disable_level is (%" PRId32 \
            ") not %d detected at %s:%d\n", \
-         _Thread_Dispatch_disable_level, (_expect), __FILE__, __LINE__ ); \
+         _Thread_Dispatch_get_disable_level(), (_expect), __FILE__, __LINE__ ); \
       FLUSH_OUTPUT(); \
       rtems_test_exit( 1 ); \