Ticket #1777: DispatchPatch.diff

c/src/lib/libbsp/powerpc/shared/startup/panic.c

@@ -101 +101 @@
       printk("  UNKNOWN (0x%x)\n",THESRC);
   break;
   }
-  if ( _Thread_Dispatch_disable_level )
+  if ( _Thread_Dispatch_in_critical_section() )
     printk(
       "  Error occurred in a Thread Dispatching DISABLED context (level %i)\n",
-      _Thread_Dispatch_disable_level);
+      _Thread_Dispatch_get_disable_level());
   else
     printk("enabled\n");
 

c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c

@@ -134 +134 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level++;
+  _Thread_Dispatch_increment_disable_level();
 
 #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   if ( _ISR_Nest_level == 0 )
@@ -156 +156 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level--;
+  _Thread_Dispatch_decrement_disable_level();
 
   _ISR_Nest_level--;
 
@@ -172 +172 @@
   if ( _ISR_Nest_level )
     return;
 
-  if ( _Thread_Dispatch_disable_level ) {
+  if ( _Thread_Dispatch_in_critical_section() ) {
     return;
   }
 

c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c

@@ -136 +136 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level++;
+  _Thread_Dispatch_increment_disable_level();
 
 #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   if ( _ISR_Nest_level == 0 )
@@ -158 +158 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level--;
+  _Thread_Dispatch_decrement_disable_level();
 
   _ISR_Nest_level--;
 
@@ -174 +174 @@
   if ( _ISR_Nest_level )
     return;
 
-  if ( _Thread_Dispatch_disable_level ) {
+  if ( _Thread_Dispatch_in_critical_section() ) {
     return;
   }
 

c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c

@@ -60 +60 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level++;
+   _Thread_Dispatch_increment_disable_level();
 
 #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   if ( _ISR_Nest_level == 0 )
@@ -82 +82 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level--;
+  _Thread_Dispatch_decrement_disable_level();
 
   _ISR_Nest_level--;
 
@@ -97 +97 @@
   if ( _ISR_Nest_level )
     return;
 
-  if ( _Thread_Dispatch_disable_level ) {
+  if ( _Thread_Dispatch_in_critical_section() ) {
     return;
   }
 

c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c

@@ -33 +33 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level++;
+  _Thread_Dispatch_increment_disable_level();
 
 #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   if ( _ISR_Nest_level == 0 )
@@ -55 +55 @@
 
   _ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level--;
+  _Thread_Dispatch_decrement_disable_level();
 
   _ISR_Nest_level--;
 
@@ -71 +71 @@
   if ( _ISR_Nest_level )
     return;
 
-  if ( _Thread_Dispatch_disable_level ) {
+  if ( _Thread_Dispatch_in_critical_section() ) {
     return;
   }
 

cpukit/libcsupport/src/malloc_deferred.c

@@ -26 +26 @@
 
 bool malloc_is_system_state_OK(void)
 {
-  if ( _Thread_Dispatch_disable_level > 0 )
+  if ( _Thread_Dispatch_in_critical_section() )
     return false;
 
   if ( _ISR_Nest_level > 0 )

cpukit/libcsupport/src/realloc.c

@@ -35 +35 @@
    */
 
   if (_System_state_Is_up(_System_state_Get())) {
-    if (_Thread_Dispatch_disable_level > 0)
+    if (_Thread_Dispatch_in_critical_section())
       return (void *) 0;
 
     if (_ISR_Nest_level > 0)

cpukit/score/Makefile.am

@@ -189 +189 @@
 libscore_a_SOURCES += src/thread.c src/threadchangepriority.c \
     src/threadclearstate.c src/threadclose.c src/threadcreateidle.c \
     src/threaddelayended.c src/threaddispatch.c \
+    src/threadenabledispatch.c src/threaddisabledispatch.c \
     src/threadget.c src/threadhandler.c src/threadinitialize.c \
     src/threadloadenv.c src/threadready.c src/threadreset.c \
     src/threadrestart.c src/threadsetpriority.c \

cpukit/score/cpu/lm32/irq.c

@@ -44 +44 @@
 
   /* Interrupts are disabled upon entry to this Handler */
 
-  _Thread_Dispatch_disable_level++;
+  _Thread_Dispatch_increment_disable_level();
 
 #if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
   if ( _ISR_Nest_level == 0 ) {
@@ -71 +71 @@
     stack_ptr = _old_stack_ptr;
 #endif
 
-  _Thread_Dispatch_disable_level--;
+  _Thread_Dispatch_decrement_disable_level();
 
   _CPU_ISR_Enable( level );
 

cpukit/score/cpu/nios2/irq.c

@@ -50 +50 @@
 
   _ISR_Nest_level++;
 
-  _Thread_Dispatch_disable_level++;
+  _Thread_Dispatch_increment_disable_level();
 
   if ( _ISR_Vector_table[ vector] )
   {
@@ -60 +60 @@
   /* Make sure that interrupts are disabled again */
   _CPU_ISR_Disable( level );
 
-  _Thread_Dispatch_disable_level--;
+  _Thread_Dispatch_decrement_disable_level();
 
   _ISR_Nest_level--;
 
@@ -69 +69 @@
     stack_ptr = _old_stack_ptr;
 #endif
 
-    if( _Thread_Dispatch_disable_level == 0 )
+    if( !_Thread_Dispatch_in_critical_section() )
     {
       if ( _Thread_Dispatch_necessary ) {
         _CPU_ISR_Enable( level );

cpukit/score/include/rtems/score/coremutex.h

@@ -368 +368 @@
 #define _CORE_mutex_Seize_body( \
   _the_mutex, _id, _wait, _timeout, _level ) \
   do { \
-    if ( _Thread_Dispatch_disable_level \
+    if ( _Thread_Dispatch_in_critical_section() \
         && (_wait) \
         && (_System_state_Get() >= SYSTEM_STATE_BEGIN_MULTITASKING ) \
        ) { \

cpukit/score/include/rtems/score/thread.h

@@ -46 +46 @@
   #define RTEMS_SCORE_THREAD_ENABLE_USER_PROVIDED_STACK_VIA_API
 #endif
 
+#if defined(RTEMS_SMP) || \
+    defined(RTEMS_HEAVY_STACK_DEBUG) || \
+    defined(RTEMS_HEAVY_MALLOC_DEBUG)
+  #define __THREAD_DO_NOT_INLINE_DISABLE_DISPATCH__
+#endif
+
+#if defined(RTEMS_SMP) || \
+   (CPU_INLINE_ENABLE_DISPATCH == FALSE) || \
+   (__RTEMS_DO_NOT_INLINE_THREAD_ENABLE_DISPATCH__ == 1) 
+  #define __THREAD_DO_NOT_INLINE_ENABLE_DISPATCH__
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

cpukit/score/inline/rtems/score/thread.inl

@@ -32 +32 @@
  */
 
 /**
+ * This routine returns true if thread dispatch indicates
+ * that we are in a critical section.
+ */
+RTEMS_INLINE_ROUTINE bool _Thread_Dispatch_in_critical_section(void)
+{
+   if (  _Thread_Dispatch_disable_level == 0 )
+    return false;
+
+   return true;
+}
+
+/**
+ * This routine returns value of the the thread dispatch level.
+ */
+RTEMS_INLINE_ROUTINE uint32_t _Thread_Dispatch_get_disable_level(void)
+{
+  return _Thread_Dispatch_disable_level;
+}
+
+/**
+ * This routine sets thread dispatch level to the 
+ * value passed in.
+ */
+RTEMS_INLINE_ROUTINE uint32_t _Thread_Dispatch_set_disable_level(uint32_t value)
+{
+  _Thread_Dispatch_disable_level = value;
+  return value;
+}
+
+/**
+ * This rountine increments the thread dispatch level
+ */
+RTEMS_INLINE_ROUTINE uint32_t _Thread_Dispatch_increment_disable_level(void)
+{
+  _Thread_Dispatch_disable_level++;
+  return _Thread_Dispatch_disable_level;
+}
+
+/**
+ * This routine decrements the thread dispatch level.
+ */
+RTEMS_INLINE_ROUTINE uint32_t _Thread_Dispatch_decrement_disable_level(void)
+{
+  _Thread_Dispatch_disable_level--;
+  return _Thread_Dispatch_disable_level;
+}
+
+
+/**
  *  This routine halts multitasking and returns control to
  *  the "thread" (i.e. the BSP) which initially invoked the
  *  routine which initialized the system.
@@ -150 +199 @@
  *  This routine prevents dispatching.
  */
 
+#if defined ( __THREAD_DO_NOT_INLINE_DISABLE_DISPATCH__ )
+void _Thread_Disable_dispatch( void );
+#else
+
 #if defined(RTEMS_HEAVY_STACK_DEBUG) || defined(RTEMS_HEAVY_MALLOC_DEBUG)
   #include <rtems/bspIo.h>
   #include <rtems/fatal.h>
@@ -163 +216 @@
    */
   extern Heap_Control  *RTEMS_Malloc_Heap;
 #endif
-
 RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void )
 {
   /*
@@ -182 +234 @@
     }
   #endif
 
-  _Thread_Dispatch_disable_level += 1;
+  _Thread_Dispatch_increment_disable_level();
   RTEMS_COMPILER_MEMORY_BARRIER();
 
   /*
@@ -190 +242 @@
    * malloc heap integrity checking upon entry to every system call.
    */
   #if defined(RTEMS_HEAVY_MALLOC_DEBUG)
-    if ( _Thread_Dispatch_disable_level == 1 ) {
+    if ( Thread_Dispatch_disable_level_value() == 1 ) {
       _Heap_Walk( RTEMS_Malloc_Heap,99, false );
     }
   #endif
 }
+#endif
 
 /**
  *  This routine allows dispatching to occur again.  If this is
@@ -203 +256 @@
  *  processor will be transferred to the heir thread.
  */
 
-#if ( (defined(CPU_INLINE_ENABLE_DISPATCH) && \
-       (CPU_INLINE_ENABLE_DISPATCH == FALSE)) || \
-      (__RTEMS_DO_NOT_INLINE_THREAD_ENABLE_DISPATCH__ == 1) )
-void _Thread_Enable_dispatch( void );
+#if defined ( __THREAD_DO_NOT_INLINE_ENABLE_DISPATCH__ )
+  void _Thread_Enable_dispatch( void );
 #else
-/* inlining of enable dispatching must be true */
-RTEMS_INLINE_ROUTINE void _Thread_Enable_dispatch( void )
-{
-  RTEMS_COMPILER_MEMORY_BARRIER();
-  if ( (--_Thread_Dispatch_disable_level) == 0 )
-    _Thread_Dispatch();
-}
+  /* inlining of enable dispatching must be true */
+  RTEMS_INLINE_ROUTINE void _Thread_Enable_dispatch( void )
+  {
+    RTEMS_COMPILER_MEMORY_BARRIER();
+    if ( Thread_Dispatch_disable_level_Decrement() == 0 )
+      _Thread_Dispatch();
+  }
 #endif
 
-
 /**
  *  This routine allows dispatching to occur again.  However,
  *  no dispatching operation is performed even if this is the outer
@@ -227 +277 @@
 RTEMS_INLINE_ROUTINE void _Thread_Unnest_dispatch( void )
 {
   RTEMS_COMPILER_MEMORY_BARRIER();
-  _Thread_Dispatch_disable_level -= 1;
+  _Thread_Dispatch_decrement_disable_level();
 }
 
 /**
@@ -237 +287 @@
 
 RTEMS_INLINE_ROUTINE bool _Thread_Is_dispatching_enabled( void )
 {
-  return ( _Thread_Dispatch_disable_level == 0 );
+  return  ( _Thread_Dispatch_in_critical_section() == false );
 }
 
 /**
@@ -256 +306 @@
 
 RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
 {
-  _Thread_Dispatch_disable_level = 1;
+  _Thread_Dispatch_set_disable_level( 1 );
 }
 
 /**

cpukit/score/src/heapfree.c

@@ -89 +89 @@
      * is the task stack of a thread that deletes itself.  The thread dispatch
      * disable level is a way to detect this use case.
      */
-    if ( _Thread_Dispatch_disable_level == 0 ) {
+    if ( !_Thread_Dispatch_in_critical_section() ) {
       Heap_Block *const next = block->Protection_begin.next_delayed_free_block;
       if ( next == NULL ) {
         _Heap_Protection_delay_block_free( heap, block );

cpukit/score/src/pheapwalk.c

@@ -39 +39 @@
    *
    * NOTE: Dispatching is also disabled during initialization.
    */
-  if ( !_Thread_Dispatch_disable_level ) {
+  if ( _Thread_Dispatch_in_critical_section() == false ) {
     _RTEMS_Lock_allocator();
       status = _Heap_Walk( the_heap, source, do_dump );
     _RTEMS_Unlock_allocator();

cpukit/score/src/smp.c

@@ -37 +37 @@
    *  This is definitely a hack until we have SMP scheduling.  Since there
    *  is only one executing and heir right now, we have to fake this out.
    */
-  _Thread_Dispatch_disable_level = 1;
+  _Thread_Dispatch_set_disable_level(1);
   _Thread_Executing = heir;
   _CPU_Context_switch_to_first_task_smp( &heir->Registers );
 }
@@ -103 +103 @@
 
   if ( message & RTEMS_BSP_SMP_SHUTDOWN ) {
     ISR_Level level;
-    _Thread_Dispatch_disable_level = 0;
+    _Thread_Dispatch_set_disable_level(0);
     _Per_CPU_Information[cpu].isr_nest_level = 0;
     _Per_CPU_Information[cpu].state = RTEMS_BSP_SMP_CPU_SHUTDOWN;
     _ISR_Disable( level );

new file cpukit/score/src/threaddisabledispatch.c

@@ +1 @@
+/*
+ *  _Thread_Disable_dispatch
+ *
+ *
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/thread.h>
+
+#if defined ( __THREAD_DO_NOT_INLINE_DISABLE_DISPATCH__ )
+void _Thread_Disable_dispatch( void )
+{
+  /*
+   *  This check is very brutal to system performance but is very helpful
+   *  at finding blown stack problems.  If you have a stack problem and
+   *  need help finding it, then uncomment this code.  Every system
+   *  call will check the stack and since mutexes are used frequently
+   *  in most systems, you might get lucky.
+   */
+  #if defined(RTEMS_HEAVY_STACK_DEBUG)
+    if (_System_state_Is_up(_System_state_Get()) && (_ISR_Nest_level == 0)) {
+      if ( rtems_stack_checker_is_blown() ) {
+        printk( "Stack blown!!\n" );
+        rtems_fatal_error_occurred( 99 );
+      }
+    }
+  #endif
+
+  _Thread_Dispatch_increment_disable_level();
+  RTEMS_COMPILER_MEMORY_BARRIER();
+
+  /*
+   * This check is even more brutal than the other one.  This enables
+   * malloc heap integrity checking upon entry to every system call.
+   */
+  #if defined(RTEMS_HEAVY_MALLOC_DEBUG)
+    if ( _Thread_Dispatch_get_disable_level() == 1 ) {
+      _Heap_Walk( RTEMS_Malloc_Heap,99, false );
+    }
+  #endif
+}
+#endif

cpukit/score/src/threaddispatch.c

@@ -1 +1 @@
 /*
  *  Thread Handler
  *
- *
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -34 +33 @@
   #include <rtems/score/timestamp.h>
 #endif
 
-/*PAGE
- *
- *  _Thread_Enable_dispatch
- *
- *  This kernel routine exits a context switch disable critical section.
- *  This is the NOT INLINED version.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  INTERRUPT LATENCY:
- *    dispatch thread
- *    no dispatch thread
- */
-
-#if ( (defined(CPU_INLINE_ENABLE_DISPATCH) &&  \
-       (CPU_INLINE_ENABLE_DISPATCH == FALSE)) || \
-      (__RTEMS_DO_NOT_INLINE_THREAD_ENABLE_DISPATCH__ == 1) )
-void _Thread_Enable_dispatch( void )
-{
-  if ( --_Thread_Dispatch_disable_level )
-    return;
-  _Thread_Dispatch();
-}
-#endif
-
-/*PAGE
- *
+/**
  *  _Thread_Dispatch
  *
  *  This kernel routine determines if a dispatch is needed, and if so
@@ -72 +43 @@
  *  ALTERNATE ENTRY POINTS:
  *    void _Thread_Enable_dispatch();
  *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
  *  INTERRUPT LATENCY:
  *    dispatch thread
  *    no dispatch thread
@@ -91 +58 @@
   _ISR_Disable( level );
   while ( _Thread_Dispatch_necessary == true ) {
     heir = _Thread_Heir;
-    _Thread_Dispatch_disable_level = 1;
+   _Thread_Dispatch_set_disable_level( 1 );
     _Thread_Dispatch_necessary = false;
     _Thread_Executing = heir;
 
@@ -185 +152 @@
   }
 
 post_switch:
-  _Thread_Dispatch_disable_level = 0;
+  _Thread_Dispatch_set_disable_level( 0 );
 
   _ISR_Enable( level );
 

new file cpukit/score/src/threadenabledispatch.c

@@ +1 @@
+/*
+ *   _Thread_Enable_dispatch
+ *
+ *
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/score/thread.h>
+
+#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
+  #include <rtems/score/timestamp.h>
+#endif
+
+
+/**
+ *  The following declares the dispatch critical section nesting
+ *  counter which is used to prevent context switches at inopportune
+ *  moments.
+ */
+
+/**
+ *  _Thread_Enable_dispatch
+ *
+ *  This kernel routine exits a context switch disable critical section.
+ *  This is the NOT INLINED version.
+ *
+ *  INTERRUPT LATENCY:
+ *    dispatch thread
+ *    no dispatch thread
+ */
+#if defined (__THREAD_DO_NOT_INLINE_ENABLE_DISPATCH__ )
+void _Thread_Enable_dispatch( void )
+{
+  if ( --_Thread_Dispatch_disable_level )
+    return;
+  _Thread_Dispatch();
+}
+#endif

testsuites/support/include/tmacros.h

@@ -25 +25 @@
 #include <string.h>
 #include <rtems/error.h>
 #include <rtems/score/thread.h> /*  _Thread_Dispatch_disable_level */
+#include <rtems/score/thread.inl> /*  _Thread_Dispatch_disable_level */
 
 #ifdef __cplusplus
 extern "C" {
@@ -48 +49 @@
 #define check_dispatch_disable_level( _expect ) \
   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 ); \
     } \

testsuites/tmtests/tm26/task1.c

@@ -453 +453 @@
 
   _Thread_Heir = _Thread_Executing;
   _Thread_Dispatch_necessary = false;
-  _Thread_Dispatch_disable_level = 0;
+  
+  _Thread_Dispatch_set_disable_level( 0 );
 
   /*
    *  Now dump all the times

testsuites/tmtests/tm27/task1.c

@@ -111 +111 @@
 
   Interrupt_nest = 0;
 
-  _Thread_Dispatch_disable_level = 0;
+  _Thread_Dispatch_set_disable_level( 0 );
 
   Interrupt_occurred = 0;
 
@@ -144 +144 @@
    *  No preempt .. nested
    */
 
-  _Thread_Dispatch_disable_level = 1;
+  _Thread_Dispatch_set_disable_level( 1 );
 
   Interrupt_nest = 1;
 
@@ -158 +158 @@
 #endif
   Interrupt_return_time = benchmark_timer_read();
 
-  _Thread_Dispatch_disable_level = 0;
+  _Thread_Dispatch_set_disable_level( 0 );
 
   put_time(
     "interrupt entry overhead: returns to nested interrupt",
@@ -180 +180 @@
    *  Does a preempt .. not nested
    */
 
-  _Thread_Dispatch_disable_level = 0;
+  _Thread_Dispatch_set_disable_level( 0 );
 
   ready_queues      = (Chain_Control *) _Scheduler.information;
   _Thread_Executing =
@@ -241 +241 @@
    *  Switch back to the other task to exit the test.
    */
 
-  _Thread_Dispatch_disable_level = 0;
+  _Thread_Dispatch_set_disable_level( 0 );
 
   ready_queues      = (Chain_Control *) _Scheduler.information;
   _Thread_Executing =

tools/schedsim/rtems/rtems_init.c

@@ -101 +101 @@
   /*
    *  Now we are back in a non-dispatching critical section
    */
-  _Thread_Dispatch_disable_level = 0;
+  _Thread_Dispatch_set_disable_level( 0 );
 
   /*
    * Print an initial message