Changeset 334c103 in mainline for kernel/generic/src/ipc/ipcrsc.c

Timestamp:

2018-03-13T18:01:48Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e7a18

Parents:

50dd854

git-author:

Jakub Jermar <jakub@…> (2018-03-10 18:18:12)

git-committer:

Jakub Jermar <jakub@…> (2018-03-13 18:01:48)

Message:

Allow phone_alloc to not publish the capability

This makes it possible and race-free to defer publishing the new
capability until the phone object is connected.

File:

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

kernel/generic/src/ipc/ipcrsc.c

@@ -150 +150 @@
 /** Allocate new phone in the specified task.
  *
- * @param task  Task for which to allocate a new phone.
- *
- * @param[out] out_handle  New phone capability handle.
+ * @param[in]  task     Task for which to allocate a new phone.
+ * @param[in]  publish  If true, the new capability will be published.
+ * @param[out] phandle  New phone capability handle.
+ * @param[out] kobject  New phone kobject.
  *
  * @return  An error code if a new capability cannot be allocated.
  */
-errno_t phone_alloc(task_t *task, cap_handle_t *out_handle)
+errno_t phone_alloc(task_t *task, bool publish, cap_handle_t *phandle,
+    kobject_t **kobject)
 {
         cap_handle_t handle;
@@ -166 +168 @@
                         return ENOMEM;
                 }
-                kobject_t *kobject = malloc(sizeof(kobject_t), FRAME_ATOMIC);
-                if (!kobject) {
+                kobject_t *kobj = malloc(sizeof(kobject_t), FRAME_ATOMIC);
+                if (!kobj) {
                         cap_free(TASK, handle);
                         slab_free(phone_cache, phone);
@@ -176 +178 @@
                 phone->state = IPC_PHONE_CONNECTING;
 
-                kobject_initialize(kobject, KOBJECT_TYPE_PHONE, phone,
+                kobject_initialize(kobj, KOBJECT_TYPE_PHONE, phone,
                     &phone_kobject_ops);
-                phone->kobject = kobject;
-
-                cap_publish(task, handle, kobject);
-
-                *out_handle = handle;
+                phone->kobject = kobj;
+
+                if (publish)
+                        cap_publish(task, handle, kobj);
+
+                *phandle = handle;
+                if (kobject)
+                        *kobject = kobj;
         }
         return rc;