rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-13 15:49:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtems-bsd-mutex: Update due to API changes

Browse Source
This commit is contained in:
Sebastian Huber 2016-09-22 07:22:42 +02:00
parent 2c44b51475
commit 02d344f4d0
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ rtems_bsd_mutex_lock(struct lock_object *lock, rtems_bsd_mutex *m)
Thread_Control *owner; Thread_Control *owner;
_Thread_queue_Context_initialize(&queue_context); _Thread_queue_Context_initialize(&queue_context);
_Thread_queue_Acquire(&m->queue, &queue_context.Lock_context); _Thread_queue_Acquire(&m->queue, &queue_context);
owner = m->queue.Queue.owner; owner = m->queue.Queue.owner;
executing = _Thread_Executing; executing = _Thread_Executing;
@ -88,7 +88,7 @@ rtems_bsd_mutex_lock(struct lock_object *lock, rtems_bsd_mutex *m)
m->queue.Queue.owner = executing; m->queue.Queue.owner = executing;
++executing->resource_count; ++executing->resource_count;
_Thread_queue_Release(&m->queue, &queue_context.Lock_context); _Thread_queue_Release(&m->queue, &queue_context);
} else { } else {
rtems_bsd_mutex_lock_more(lock, m, owner, executing, rtems_bsd_mutex_lock_more(lock, m, owner, executing,
&queue_context); &queue_context);
@ -104,7 +104,7 @@ rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m)
Thread_Control *owner; Thread_Control *owner;
_Thread_queue_Context_initialize(&queue_context); _Thread_queue_Context_initialize(&queue_context);
_Thread_queue_Acquire(&m->queue, &queue_context.Lock_context); _Thread_queue_Acquire(&m->queue, &queue_context);
owner = m->queue.Queue.owner; owner = m->queue.Queue.owner;
executing = _Thread_Executing; executing = _Thread_Executing;
@ -121,7 +121,7 @@ rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m)
success = 0; success = 0;
} }
_Thread_queue_Release(&m->queue, &queue_context.Lock_context); _Thread_queue_Release(&m->queue, &queue_context);
return (success); return (success);
} }
@ -134,7 +134,7 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
int nest_level; int nest_level;
_Thread_queue_Context_initialize(&queue_context); _Thread_queue_Context_initialize(&queue_context);
_Thread_queue_Acquire(&m->queue, &queue_context.Lock_context); _Thread_queue_Acquire(&m->queue, &queue_context);
nest_level = m->nest_level; nest_level = m->nest_level;
owner = m->queue.Queue.owner; owner = m->queue.Queue.owner;
@ -143,35 +143,21 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
if (__predict_true(nest_level == 0)) { if (__predict_true(nest_level == 0)) {
Thread_queue_Heads *heads; Thread_queue_Heads *heads;
int keep_priority;
--owner->resource_count;
/*
* Ensure that the owner resource count is visible to all other
* processors and that we read the latest priority restore
* hint.
*/
_Atomic_Fence( ATOMIC_ORDER_ACQ_REL );
heads = m->queue.Queue.heads; heads = m->queue.Queue.heads;
keep_priority = _Thread_Owns_resources(owner)
|| !owner->priority_restore_hint;
m->queue.Queue.owner = NULL; m->queue.Queue.owner = NULL;
--owner->resource_count;
if (__predict_true(heads == NULL && keep_priority)) { if (__predict_true(heads == NULL)) {
_Thread_queue_Release(&m->queue, &queue_context.Lock_context); _Thread_queue_Release(&m->queue, &queue_context);
} else { } else {
_Thread_queue_Surrender(&m->queue.Queue, _Thread_queue_Surrender(&m->queue.Queue, heads, owner,
RTEMS_BSD_MUTEX_TQ_OPERATIONS, heads, owner, &queue_context, RTEMS_BSD_MUTEX_TQ_OPERATIONS);
keep_priority, &queue_context);
} }
} else { } else {
m->nest_level = nest_level - 1; m->nest_level = nest_level - 1;
_Thread_queue_Release(&m->queue, &queue_context.Lock_context); _Thread_queue_Release(&m->queue, &queue_context);
} }
} }