Changeset c1f68b0 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2017-10-28T11:40:41Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

eca820c

Parents:

15d9fe6

Message:

Use recursive mutex to protect task_t::cap_info

This makes it possible to use the mutex-protected capability APIs even
inside caps_apply_to_kobject_type() callbacks. Now there is no need to
provide eg. cap_unpublish_locked() and cap_free_locked(). Likewise,
ipc_irq_unsubscribe() can be used when the task's cap_info is already
locked by the current thread inside of a callback.

File:

• kernel/generic/src/ipc/ipc.c (modified) (2 diffs)

kernel/generic/src/ipc/ipc.c

@@ -829 +829 @@
 {
         ipc_phone_hangup(cap->kobject->phone);
-        kobject_t *kobj = cap_unpublish_locked(cap->task, cap->handle,
+        kobject_t *kobj = cap_unpublish(cap->task, cap->handle,
             KOBJECT_TYPE_PHONE);
         kobject_put(kobj);
-        cap_free_locked(cap->task, cap->handle);
+        cap_free(cap->task, cap->handle);
         return true;
 }
@@ -839 +839 @@
 {
         ipc_irq_unsubscribe(&TASK->answerbox, cap->handle);
-        kobject_t *kobj = cap_unpublish_locked(cap->task, cap->handle,
-            KOBJECT_TYPE_IRQ);
-        kobject_put(kobj);
-        cap_free_locked(cap->task, cap->handle);
         return true;
 }