Changeset bbe654af in rtems

Timestamp:

Apr 19, 2016, 4:18:52 AM (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

48b04fc3

Parents:

b8bdced1

git-author:

Sebastian Huber <sebastian.huber@…> (04/19/16 04:18:52)

git-committer:

Sebastian Huber <sebastian.huber@…> (04/21/16 05:29:39)

Message:

score: Add and use _CORE_mutex_Acquire_critical()

Add and use _CORE_mutex_Release().

File:

• cpukit/score/include/rtems/score/coremuteximpl.h (modified) (7 diffs)

cpukit/score/include/rtems/score/coremuteximpl.h

@@ -112 +112 @@
 {
   _Thread_queue_Destroy( &the_mutex->Wait_queue );
+}
+
+RTEMS_INLINE_ROUTINE void _CORE_mutex_Acquire_critical(
+  CORE_mutex_Control *the_mutex,
+  ISR_lock_Context   *lock_context
+)
+{
+  _Thread_queue_Acquire_critical( &the_mutex->Wait_queue, lock_context );
+}
+
+RTEMS_INLINE_ROUTINE void _CORE_mutex_Release(
+  CORE_mutex_Control *the_mutex,
+  ISR_lock_Context   *lock_context
+)
+{
+  _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
 }
 
@@ -246 +262 @@
     );
   }
-  _Thread_queue_Acquire_critical( &the_mutex->Wait_queue, lock_context );
+  _CORE_mutex_Acquire_critical( the_mutex, lock_context );
   if ( _CORE_mutex_Seize_interrupt_trylock( the_mutex, executing, lock_context ) ) {
     if ( !wait ) {
-      _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+      _CORE_mutex_Release( the_mutex, lock_context );
       executing->Wait.return_code =
         CORE_MUTEX_STATUS_UNSATISFIED_NOWAIT;
@@ -463 +479 @@
 
     if ( !_CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) {
-      _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+      _CORE_mutex_Release( the_mutex, lock_context );
       return 0;
     } /* else must be CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING
@@ -477 +493 @@
       current = executing->current_priority;
       if ( current == ceiling ) {
-        _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+        _CORE_mutex_Release( the_mutex, lock_context );
         return 0;
       }
@@ -485 +501 @@
 
         cpu_self = _Thread_Dispatch_disable_critical( lock_context );
-        _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+        _CORE_mutex_Release( the_mutex, lock_context );
         _Thread_Raise_priority( executing, ceiling );
         _Thread_Dispatch_enable( cpu_self );
@@ -495 +511 @@
         the_mutex->nest_count = 0;     /* undo locking above */
         executing->resource_count--;   /* undo locking above */
-        _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+        _CORE_mutex_Release( the_mutex, lock_context );
         return 0;
       }
@@ -511 +527 @@
       case CORE_MUTEX_NESTING_ACQUIRES:
         the_mutex->nest_count++;
-        _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+        _CORE_mutex_Release( the_mutex, lock_context );
         return 0;
       #if defined(RTEMS_POSIX_API)
         case CORE_MUTEX_NESTING_IS_ERROR:
           executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED;
-          _Thread_queue_Release( &the_mutex->Wait_queue, lock_context );
+          _CORE_mutex_Release( the_mutex, lock_context );
           return 0;
       #endif