diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-06-28 08:32:30 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-07-28 08:07:14 +0200 |
| commit | bf7faad356379aeec4fea6c7ddfbf2b1afcd1471 (patch) | |
| tree | d34d45a70ab8abfe7ae4a329f4a66006dc0c003a /rtemsbsd/rtems/rtems-kernel-muteximpl.c | |
| parent | kern/sleepqueue: Update due to API changes (diff) | |
| download | rtems-libbsd-bf7faad356379aeec4fea6c7ddfbf2b1afcd1471.tar.bz2 | |
rtems-bsd-mutex: Update due to API changes
Diffstat (limited to 'rtemsbsd/rtems/rtems-kernel-muteximpl.c')
| -rw-r--r-- | rtemsbsd/rtems/rtems-kernel-muteximpl.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/rtemsbsd/rtems/rtems-kernel-muteximpl.c b/rtemsbsd/rtems/rtems-kernel-muteximpl.c index 4f3d6473..616e0dc3 100644 --- a/rtemsbsd/rtems/rtems-kernel-muteximpl.c +++ b/rtemsbsd/rtems/rtems-kernel-muteximpl.c @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2014, 2015 embedded brains GmbH. All rights reserved. + * Copyright (c) 2014, 2016 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Dornierstr. 4 @@ -43,7 +43,7 @@ #include <rtems/score/schedulerimpl.h> #include <rtems/score/threadqimpl.h> -#define BSD_MUTEX_TQ_OPERATIONS &_Thread_queue_Operations_priority +#define BSD_MUTEX_TQ_OPERATIONS &_Thread_queue_Operations_priority_inherit void rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, @@ -56,15 +56,14 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, _Thread_queue_Release(&m->queue, &queue_context->Lock_context); } else { - /* Priority inheritance */ - _Thread_Raise_priority(owner, executing->current_priority); - ++executing->resource_count; _Thread_queue_Context_set_expected_level(queue_context, 1); _Thread_queue_Context_set_no_timeout(queue_context); - _Thread_queue_Enqueue_critical(&m->queue, + _Thread_queue_Context_set_deadlock_callout(queue_context, + _Thread_queue_Deadlock_fatal); + _Thread_queue_Enqueue_critical(&m->queue.Queue, BSD_MUTEX_TQ_OPERATIONS, executing, - STATES_WAITING_FOR_MUTEX, queue_context); + STATES_WAITING_FOR_SYS_LOCK_MUTEX, queue_context); } } @@ -79,8 +78,8 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner, operations = BSD_MUTEX_TQ_OPERATIONS; new_owner = ( *operations->first )( heads ); - m->owner = new_owner; - _Thread_queue_Extract_critical(&m->queue, operations, + m->queue.Queue.owner = new_owner; + _Thread_queue_Extract_critical(&m->queue.Queue, operations, new_owner, queue_context); } else { _Thread_queue_Release(&m->queue, &queue_context->Lock_context); |