Changeset 70d52b8 in rtems-libbsd for rtemsbsd

Timestamp:

05/30/16 14:05:15 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

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

Children:

f9798ad

Parents:

b367591

git-author:

Sebastian Huber <sebastian.huber@…> (05/30/16 14:05:15)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/30/16 14:06:42)

Message:

rtems-bsd-mutex: Update due to API changes

Location:

rtemsbsd

Files:

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

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

@@ -76 +76 @@
         Thread_Control *owner;
 
-        _Thread_queue_Context_initialize(&queue_context, NULL);
+        _Thread_queue_Context_initialize(&queue_context);
         _Thread_queue_Acquire(&m->queue, &queue_context.Lock_context);
 
@@ -101 +101 @@
         Thread_Control *owner;
 
-        _Thread_queue_Context_initialize(&queue_context, NULL);
+        _Thread_queue_Context_initialize(&queue_context);
         _Thread_queue_Acquire(&m->queue, &queue_context.Lock_context);
 
@@ -135 +135 @@
         int nest_level;
 
-        _Thread_queue_Context_initialize(&queue_context, NULL);
+        _Thread_queue_Context_initialize(&queue_context);
         _Thread_queue_Acquire(&m->queue, &queue_context.Lock_context);
 

rtemsbsd/rtems/rtems-kernel-muteximpl.c

@@ -61 +61 @@
 
                 ++executing->resource_count;
+                _Thread_queue_Context_set_expected_level(queue_context, 1);
                 _Thread_queue_Enqueue_critical(&m->queue,
                     BSD_MUTEX_TQ_OPERATIONS, executing,
-                    STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0,
-                    &queue_context->Lock_context);
+                    STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT,
+                    queue_context);
         }
 }