summaryrefslogtreecommitdiffstats
path: root/cpukit/score/include/rtems/score
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-28 06:26:01 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-02 07:46:16 +0200
commit500a8e9c62dca9f62611ecca64857dadb2bc0557 (patch)
tree1ffd836015e5397eeac688dc1c6ced38d587c40e /cpukit/score/include/rtems/score
parentscore: Avoid Giant lock for set time of day (diff)
downloadrtems-500a8e9c62dca9f62611ecca64857dadb2bc0557.tar.bz2
score: Delete __RTEMS_STRICT_ORDER_MUTEX__
Remove support for strict order mutexes. Close #2124.
Diffstat (limited to '')
-rw-r--r--cpukit/score/include/rtems/score/coremutex.h25
-rw-r--r--cpukit/score/include/rtems/score/coremuteximpl.h14
-rw-r--r--cpukit/score/include/rtems/score/thread.h6
3 files changed, 0 insertions, 45 deletions
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
index c9b30dd956..41f1c4f22d 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/score/include/rtems/score/coremutex.h
@@ -121,26 +121,6 @@ typedef struct {
Priority_Control priority_ceiling;
} CORE_mutex_Attributes;
-#ifdef __RTEMS_STRICT_ORDER_MUTEX__
-/**
- * @brief The control block to manage lock chain of priority inheritance mutex.
- *
- * The following defines the control block used to manage lock chain of
- * priority inheritance mutex.
- */
- typedef struct{
- /** This field is a chian of locked mutex by a thread,new mutex will
- * be added to the head of queue, and the mutex which will be released
- * must be the head of queue.
- */
- Chain_Node lock_queue;
- /** This field is the priority of thread before locking this mutex
- *
- */
- Priority_Control priority_before;
- } CORE_mutex_order_list;
-#endif
-
/**
* @brief Control block used to manage each mutex.
*
@@ -170,11 +150,6 @@ typedef struct {
* has not unlocked it. If the thread is not locked, there is no holder.
*/
Thread_Control *holder;
-#ifdef __RTEMS_STRICT_ORDER_MUTEX__
- /** This field is used to manipulate the priority inheritance mutex queue*/
- CORE_mutex_order_list queue;
-#endif
-
} CORE_mutex_Control;
/**@}*/
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h
index 4b144e8836..69935b5af3 100644
--- a/cpukit/score/include/rtems/score/coremuteximpl.h
+++ b/cpukit/score/include/rtems/score/coremuteximpl.h
@@ -66,13 +66,6 @@ typedef enum {
*/
CORE_MUTEX_TIMEOUT,
-#if defined(__RTEMS_STRICT_ORDER_MUTEX__)
- /** This status indicates that a thread not release the mutex which has
- * the priority inheritance property in a right order.
- */
- CORE_MUTEX_RELEASE_NOT_ORDER,
-#endif
-
/** This status indicates that a thread of logically greater importance
* than the ceiling priority attempted to lock this mutex.
*/
@@ -489,13 +482,6 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body(
the_mutex->nest_count = 1;
if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) ||
_CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ){
-
-#ifdef __RTEMS_STRICT_ORDER_MUTEX__
- _Chain_Prepend_unprotected( &executing->lock_mutex,
- &the_mutex->queue.lock_queue );
- the_mutex->queue.priority_before = executing->current_priority;
-#endif
-
executing->resource_count++;
}
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 4da4a341d6..8bc12d2e33 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -808,12 +808,6 @@ struct _Thread_Control {
SMP_lock_Stats Potpourri_stats;
#endif
-#ifdef __RTEMS_STRICT_ORDER_MUTEX__
- /** This field is the head of queue of priority inheritance mutex
- * held by the thread.
- */
- Chain_Control lock_mutex;
-#endif
#if defined(RTEMS_SMP)
/**
* @brief Resource node to build a dependency tree in case this thread owns