rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-17 05:43:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtems-bsd-mutex: Support priority changes

Browse Source
This commit is contained in:
Sebastian Huber
2015-03-24 09:42:28 +01:00
parent 5bcdc25e72
commit 9bfcb86790
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtemsbsd/include/machine/rtems-bsd-muteximpl.h
View File

@@ -131,18 +131,20 @@ static inline void
rtems_bsd_mutex_unlock(rtems_bsd_mutex *m) rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
{ {
ISR_lock_Context lock_context; ISR_lock_Context lock_context;
Thread_Control *owner;
int nest_level; int nest_level;
_ISR_lock_ISR_disable_and_acquire(&m->lock, &lock_context); _ISR_lock_ISR_disable_and_acquire(&m->lock, &lock_context);
nest_level = m->nest_level; nest_level = m->nest_level;
owner = m->owner;
BSD_ASSERT(owner == _Thread_Executing);
if (__predict_true(nest_level == 0)) { if (__predict_true(nest_level == 0)) {
RBTree_Node *first = _RBTree_First(&m->rivals, RBT_LEFT); RBTree_Node *first = _RBTree_First(&m->rivals, RBT_LEFT);
Thread_Control *owner = m->owner;
int keep_priority; int keep_priority;
BSD_ASSERT(owner == _Thread_Executing);
--owner->resource_count; --owner->resource_count;
keep_priority = _Thread_Owns_resources(owner) keep_priority = _Thread_Owns_resources(owner)
|| owner->real_priority == owner->current_priority; || owner->real_priority == owner->current_priority;

37
rtemsbsd/rtems/rtems-bsd-muteximpl.c
View File

@@ -53,6 +53,17 @@
#define INTERRUPT_SATISFIED \ #define INTERRUPT_SATISFIED \
(THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_INTERRUPT_SATISFIED) (THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_INTERRUPT_SATISFIED)
static void
rtems_bsd_mutex_priority_change(Thread_Control *thread,
Priority_Control new_priority, void *context)
{
rtems_bsd_mutex *m = context;
_RBTree_Extract(&m->rivals, &thread->RBNode);
_RBTree_Insert(&m->rivals, &thread->RBNode,
_Thread_queue_Compare_priority, false);
}
void void
rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
Per_CPU_Control *cpu_self, Thread_Control *owner, Per_CPU_Control *cpu_self, Thread_Control *owner,
@@ -66,12 +77,14 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
} else { } else {
bool success; bool success;
_Thread_Lock_set(executing, &m->lock);
_Thread_Priority_set_change_handler(executing,
rtems_bsd_mutex_priority_change, m);
++executing->resource_count;
_RBTree_Insert(&m->rivals, &executing->RBNode, _RBTree_Insert(&m->rivals, &executing->RBNode,
_Thread_queue_Compare_priority, false); _Thread_queue_Compare_priority, false);
++executing->resource_count;
_Thread_Dispatch_disable_critical(cpu_self); _Thread_Dispatch_disable_critical(cpu_self);
_Giant_Acquire(cpu_self);
/* Priority inheritance */ /* Priority inheritance */
_Scheduler_Change_priority_if_higher(_Scheduler_Get(owner), _Scheduler_Change_priority_if_higher(_Scheduler_Get(owner),
@@ -86,10 +99,10 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
success = _Thread_Wait_flags_try_change(executing, success = _Thread_Wait_flags_try_change(executing,
INTEND_TO_BLOCK, BLOCKED); INTEND_TO_BLOCK, BLOCKED);
if (!success) { if (!success) {
_Thread_Unblock(executing); _Thread_Clear_state(executing,
STATES_WAITING_FOR_MUTEX);
} }
_Giant_Release(cpu_self);
_Thread_Dispatch_enable(cpu_self); _Thread_Dispatch_enable(cpu_self);
} }
} }
@@ -102,10 +115,11 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
Thread_Control *new_owner; Thread_Control *new_owner;
bool success; bool success;
_RBTree_Extract(&m->rivals, first);
new_owner = THREAD_RBTREE_NODE_TO_THREAD(first); new_owner = THREAD_RBTREE_NODE_TO_THREAD(first);
m->owner = new_owner; m->owner = new_owner;
_RBTree_Extract(&m->rivals, &new_owner->RBNode);
_Thread_Priority_restore_default_change_handler(new_owner);
_Thread_Lock_restore_default(new_owner);
success = _Thread_Wait_flags_try_change_critical(new_owner, success = _Thread_Wait_flags_try_change_critical(new_owner,
INTEND_TO_BLOCK, INTERRUPT_SATISFIED); INTEND_TO_BLOCK, INTERRUPT_SATISFIED);
@@ -119,11 +133,10 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
_Thread_Dispatch_disable_critical(cpu_self); _Thread_Dispatch_disable_critical(cpu_self);
_ISR_lock_Release_and_ISR_enable(&m->lock, _ISR_lock_Release_and_ISR_enable(&m->lock,
lock_context); lock_context);
_Giant_Acquire(cpu_self);
_Thread_Unblock(new_owner); _Thread_Clear_state(new_owner,
STATES_WAITING_FOR_MUTEX);
_Giant_Release(cpu_self);
_Thread_Dispatch_enable(cpu_self); _Thread_Dispatch_enable(cpu_self);
} }
} else { } else {
@@ -131,8 +144,10 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
} }
if (!keep_priority) { if (!keep_priority) {
_Thread_Disable_dispatch(); Per_CPU_Control *cpu_self;
cpu_self = _Thread_Dispatch_disable();
_Thread_Change_priority(owner, owner->real_priority, true); _Thread_Change_priority(owner, owner->real_priority, true);
_Thread_Enable_dispatch(); _Thread_Dispatch_enable(cpu_self);
} }
} }