rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-15 22:56:40 +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-05-25 13:09:58 +02:00
parent d8e6b4c170
commit 9546d905c2
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,16 +66,17 @@ rtems_bsd_mutex_init(struct lock_object *lock, rtems_bsd_mutex *m,
void rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, void rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
Thread_Control *owner, Thread_Control *executing, Thread_Control *owner, Thread_Control *executing,
ISR_lock_Context *lock_context); Thread_queue_Context *queue_context);
static inline void static inline void
rtems_bsd_mutex_lock(struct lock_object *lock, rtems_bsd_mutex *m) rtems_bsd_mutex_lock(struct lock_object *lock, rtems_bsd_mutex *m)
{ {
ISR_lock_Context lock_context; Thread_queue_Context queue_context;
Thread_Control *executing; Thread_Control *executing;
Thread_Control *owner; Thread_Control *owner;
_Thread_queue_Acquire(&m->queue, &lock_context); _Thread_queue_Context_initialize(&queue_context, NULL);
_Thread_queue_Acquire(&m->queue, &queue_context.Lock_context);
owner = m->owner; owner = m->owner;
executing = _Thread_Executing; executing = _Thread_Executing;
@@ -84,10 +85,10 @@ rtems_bsd_mutex_lock(struct lock_object *lock, rtems_bsd_mutex *m)
m->owner = executing; m->owner = executing;
++executing->resource_count; ++executing->resource_count;
_Thread_queue_Release(&m->queue, &lock_context); _Thread_queue_Release(&m->queue, &queue_context.Lock_context);
} else { } else {
rtems_bsd_mutex_lock_more(lock, m, owner, executing, rtems_bsd_mutex_lock_more(lock, m, owner, executing,
&lock_context); &queue_context);
} }
} }
@@ -95,11 +96,12 @@ static inline int
rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m) rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m)
{ {
int success; int success;
ISR_lock_Context lock_context; Thread_queue_Context queue_context;
Thread_Control *executing; Thread_Control *executing;
Thread_Control *owner; Thread_Control *owner;
_Thread_queue_Acquire(&m->queue, &lock_context); _Thread_queue_Context_initialize(&queue_context, NULL);
_Thread_queue_Acquire(&m->queue, &queue_context.Lock_context);
owner = m->owner; owner = m->owner;
executing = _Thread_Executing; executing = _Thread_Executing;
@@ -116,23 +118,24 @@ rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m)
success = 0; success = 0;
} }
_Thread_queue_Release(&m->queue, &lock_context); _Thread_queue_Release(&m->queue, &queue_context.Lock_context);
return (success); return (success);
} }
void rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner, void rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
int keep_priority, Thread_queue_Heads *heads, int keep_priority, Thread_queue_Heads *heads,
ISR_lock_Context *lock_context); Thread_queue_Context *queue_context);
static inline void static inline void
rtems_bsd_mutex_unlock(rtems_bsd_mutex *m) rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
{ {
ISR_lock_Context lock_context; Thread_queue_Context queue_context;
Thread_Control *owner; Thread_Control *owner;
int nest_level; int nest_level;
_Thread_queue_Acquire(&m->queue, &lock_context); _Thread_queue_Context_initialize(&queue_context, NULL);
_Thread_queue_Acquire(&m->queue, &queue_context.Lock_context);
nest_level = m->nest_level; nest_level = m->nest_level;
owner = m->owner; owner = m->owner;
@@ -159,16 +162,16 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m)
m->owner = NULL; m->owner = NULL;
if (__predict_true(heads == NULL && keep_priority)) { if (__predict_true(heads == NULL && keep_priority)) {
_Thread_queue_Release(&m->queue, &lock_context); _Thread_queue_Release(&m->queue, &queue_context.Lock_context);
} else { } else {
rtems_bsd_mutex_unlock_more(m, owner, keep_priority, rtems_bsd_mutex_unlock_more(m, owner, keep_priority,
heads, &lock_context); heads, &queue_context);
} }
} else { } else {
m->nest_level = nest_level - 1; m->nest_level = nest_level - 1;
_Thread_queue_Release(&m->queue, &lock_context); _Thread_queue_Release(&m->queue, &queue_context.Lock_context);
} }
} }

12
rtemsbsd/rtems/rtems-kernel-muteximpl.c
View File

@@ -48,13 +48,13 @@
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,
Thread_Control *owner, Thread_Control *executing, Thread_Control *owner, Thread_Control *executing,
ISR_lock_Context *lock_context) Thread_queue_Context *queue_context)
{ {
if (owner == executing) { if (owner == executing) {
BSD_ASSERT(lock->lo_flags & LO_RECURSABLE); BSD_ASSERT(lock->lo_flags & LO_RECURSABLE);
++m->nest_level; ++m->nest_level;
_Thread_queue_Release(&m->queue, lock_context); _Thread_queue_Release(&m->queue, &queue_context->Lock_context);
} else { } else {
/* Priority inheritance */ /* Priority inheritance */
_Thread_Raise_priority(owner, executing->current_priority); _Thread_Raise_priority(owner, executing->current_priority);
@@ -63,14 +63,14 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
_Thread_queue_Enqueue_critical(&m->queue, _Thread_queue_Enqueue_critical(&m->queue,
BSD_MUTEX_TQ_OPERATIONS, executing, BSD_MUTEX_TQ_OPERATIONS, executing,
STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0, STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0,
lock_context); &queue_context->Lock_context);
} }
} }
void void
rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner, rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
int keep_priority, Thread_queue_Heads *heads, int keep_priority, Thread_queue_Heads *heads,
ISR_lock_Context *lock_context) Thread_queue_Context *queue_context)
{ {
if (heads != NULL) { if (heads != NULL) {
const Thread_queue_Operations *operations; const Thread_queue_Operations *operations;
@@ -80,9 +80,9 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
new_owner = ( *operations->first )( heads ); new_owner = ( *operations->first )( heads );
m->owner = new_owner; m->owner = new_owner;
_Thread_queue_Extract_critical(&m->queue, operations, _Thread_queue_Extract_critical(&m->queue, operations,
new_owner, NULL, 0, lock_context); new_owner, queue_context);
} else { } else {
_Thread_queue_Release(&m->queue, lock_context); _Thread_queue_Release(&m->queue, &queue_context->Lock_context);
} }
if (!keep_priority) { if (!keep_priority) {