Changeset 07ff2c1 in rtems-libbsd

Timestamp:

07/24/15 08:42:35 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

2fc413a

Parents:

3cb5e9e

Message:

rtems-bsd-mutex: Update due to API changes

Location:

rtemsbsd

Files:

• include/machine/rtems-bsd-mutex.h (modified) (1 diff)
• include/machine/rtems-bsd-muteximpl.h (modified) (5 diffs)
• rtems/rtems-bsd-muteximpl.c (modified) (3 diffs)

rtemsbsd/include/machine/rtems-bsd-mutex.h

@@ -49 +49 @@
 
 typedef struct {
-        Thread_queue_Control queue;
+        Thread_queue_Queue queue;
         Thread_Control *owner;
         int nest_level;

rtemsbsd/include/machine/rtems-bsd-muteximpl.h

@@ -123 +123 @@
 
 void rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
-    int keep_priority, RBTree_Node *first, ISR_lock_Context *lock_context);
+    int keep_priority, Thread_queue_Heads *heads,
+    ISR_lock_Context *lock_context);
 
 static inline void
@@ -140 +141 @@
 
         if (__predict_true(nest_level == 0)) {
-                RBTree_Node *first;
+                Thread_queue_Heads *heads;
                 int keep_priority;
 
@@ -152 +153 @@
                 _Atomic_Fence( ATOMIC_ORDER_ACQ_REL );
 
-                first = _RBTree_First(&m->queue.Queues.Priority, RBT_LEFT);
+                heads = m->queue.heads;
                 keep_priority = _Thread_Owns_resources(owner)
                     || !owner->priority_restore_hint;
@@ -158 +159 @@
                 m->owner = NULL;
 
-                if (__predict_true(first == NULL && keep_priority)) {
+                if (__predict_true(heads == NULL && keep_priority)) {
                         _Thread_queue_Release(&m->queue, &lock_context);
                 } else {
                         rtems_bsd_mutex_unlock_more(m, owner, keep_priority,
-                            first, &lock_context);
+                            heads, &lock_context);
                 }
 
@@ -189 +190 @@
 rtems_bsd_mutex_destroy(struct lock_object *lock, rtems_bsd_mutex *m)
 {
-        BSD_ASSERT(_RBTree_Is_empty(&m->queue.Queues.Priority));
+        BSD_ASSERT(m->queue.heads == NULL);
 
         if (rtems_bsd_mutex_owned(m)) {

rtemsbsd/rtems/rtems-bsd-muteximpl.c

@@ -44 +44 @@
 #include <rtems/score/threadqimpl.h>
 
+#define BSD_MUTEX_TQ_OPERATIONS &_Thread_queue_Operations_priority
+
 void
 rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
@@ -59 +61 @@
 
                 ++executing->resource_count;
-                _Thread_queue_Enqueue_critical(&m->queue, executing,
+                _Thread_queue_Enqueue_critical(&m->queue,
+                    BSD_MUTEX_TQ_OPERATIONS, executing,
                     STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0,
                     lock_context);
@@ -67 +70 @@
 void
 rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
-    int keep_priority, RBTree_Node *first, ISR_lock_Context *lock_context)
+    int keep_priority, Thread_queue_Heads *heads,
+    ISR_lock_Context *lock_context)
 {
-        if (first != NULL) {
+        if (heads != NULL) {
+                const Thread_queue_Operations *operations;
                 Thread_Control *new_owner;
 
-                new_owner = THREAD_RBTREE_NODE_TO_THREAD(first);
+                operations = BSD_MUTEX_TQ_OPERATIONS;
+                new_owner = ( *operations->first )( heads );
                 m->owner = new_owner;
-                _Thread_queue_Extract_critical(&m->queue, new_owner,
-                    lock_context);
+                _Thread_queue_Extract_critical(&m->queue, operations,
+                    new_owner, lock_context);
         } else {
                 _Thread_queue_Release(&m->queue, lock_context);