From d7c388321ad2f250cb35f01dc4c8dda7489c3416 Mon Sep 17 00:00:00 2001
From: Jennifer Averett <Jennifer.Averett@OARcorp.com>
Date: Thu, 21 Apr 2011 19:05:15 +0000
Subject: 2011-04-21	Jennifer Averett <Jennifer.Averett@OARcorp.com

	PR 1777/cpukit
	* libcsupport/src/malloc_deferred.c, libcsupport/src/realloc.c,
	score/Makefile.am, score/cpu/lm32/irq.c, score/cpu/nios2/irq.c,
	score/include/rtems/score/coremutex.h,
	score/include/rtems/score/thread.h,
	score/inline/rtems/score/thread.inl, score/src/heapfree.c,
	score/src/pheapwalk.c, score/src/smp.c, score/src/threaddispatch.c:
	Consolidated access to _Thread_Dispatch_disable_level.
	* score/src/threaddisabledispatch.c, score/src/threadenabledispatch.c:
	New files.
---
 cpukit/score/inline/rtems/score/thread.inl | 138 ++++++++++++++++-------------
 1 file changed, 74 insertions(+), 64 deletions(-)

(limited to 'cpukit/score/inline/rtems/score/thread.inl')

diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
index e700bdfb53..7ff1e615fb 100644
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ b/cpukit/score/inline/rtems/score/thread.inl
@@ -31,6 +31,64 @@
  *  @{
  */
 
+/**
+ * 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 initializes the thread dispatching subsystem.
+ */
+
+RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
+{
+  _Thread_Dispatch_set_disable_level( 1 );
+}
+
+
 /**
  *  This routine halts multitasking and returns control to
  *  the "thread" (i.e. the BSP) which initially invoked the
@@ -150,51 +208,15 @@ RTEMS_INLINE_ROUTINE void _Thread_Deallocate_fp( void )
  *  This routine prevents dispatching.
  */
 
-#if defined(RTEMS_HEAVY_STACK_DEBUG) || defined(RTEMS_HEAVY_MALLOC_DEBUG)
-  #include <rtems/bspIo.h>
-  #include <rtems/fatal.h>
-  #include <rtems/stackchk.h>
-  #include <rtems/score/sysstate.h>
-  #include <rtems/score/heap.h>
-
-  /*
-   * This is currently not defined in any .h file, so we have to
-   * extern it here.
-   */
-  extern Heap_Control  *RTEMS_Malloc_Heap;
-#endif
-
+#if defined ( __THREAD_DO_NOT_INLINE_DISABLE_DISPATCH__ )
+void _Thread_Disable_dispatch( void );
+#else
 RTEMS_INLINE_ROUTINE 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_disable_level += 1;
+  _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_disable_level == 1 ) {
-      _Heap_Walk( RTEMS_Malloc_Heap,99, false );
-    }
-  #endif
 }
+#endif
 
 /**
  *  This routine allows dispatching to occur again.  If this is
@@ -203,21 +225,18 @@ RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void )
  *  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_decrement_disable_level() == 0 )
+      _Thread_Dispatch();
+  }
 #endif
 
-
 /**
  *  This routine allows dispatching to occur again.  However,
  *  no dispatching operation is performed even if this is the outer
@@ -227,7 +246,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Enable_dispatch( void )
 RTEMS_INLINE_ROUTINE void _Thread_Unnest_dispatch( void )
 {
   RTEMS_COMPILER_MEMORY_BARRIER();
-  _Thread_Dispatch_disable_level -= 1;
+  _Thread_Dispatch_decrement_disable_level();
 }
 
 /**
@@ -237,7 +256,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Unnest_dispatch( void )
 
 RTEMS_INLINE_ROUTINE bool _Thread_Is_dispatching_enabled( void )
 {
-  return ( _Thread_Dispatch_disable_level == 0 );
+  return  ( _Thread_Dispatch_in_critical_section() == false );
 }
 
 /**
@@ -250,15 +269,6 @@ RTEMS_INLINE_ROUTINE bool _Thread_Is_context_switch_necessary( void )
   return ( _Thread_Dispatch_necessary );
 }
 
-/**
- *  This routine initializes the thread dispatching subsystem.
- */
-
-RTEMS_INLINE_ROUTINE void _Thread_Dispatch_initialization( void )
-{
-  _Thread_Dispatch_disable_level = 1;
-}
-
 /**
  *  This function returns true if the_thread is NULL and false otherwise.
  */
-- 
cgit v1.2.3