Changeset 48bcf49 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2017-09-28T22:08:15Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6636fb19

Parents:

dd20cbb

Message:

Introduce reference-counted kobjects

Capabilities are thus reduced to task-local names for references to kobjects.

File:

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

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @return Phone capability on success, or negative error code.
+ * @return Phone capability handle on success, or negative error code.
  *
  */
@@ -236 +236 @@
         }
         
-        int cap = phone_alloc(TASK);
-        if (cap < 0) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                return ELIMIT;
-        }
-        
+        cap_handle_t phone_handle = phone_alloc(TASK);
+        if (phone_handle < 0) {
+                mutex_unlock(&task->kb.cleanup_lock);
+                return phone_handle;
+        }
+        
+        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
+            KOBJECT_TYPE_PHONE);
         /* Connect the newly allocated phone to the kbox */
-        (void) ipc_phone_connect(phone_get_current(cap), &task->kb.box);
+        /* Hand over phone_obj's reference to ipc_phone_connect() */
+        (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
         
         if (task->kb.thread != NULL) {
                 mutex_unlock(&task->kb.cleanup_lock);
-                return cap;
+                return phone_handle;
         }
         
@@ -263 +266 @@
         mutex_unlock(&task->kb.cleanup_lock);
         
-        return cap;
+        return phone_handle;
 }