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

Timestamp:

2017-09-28T22:08:15Z (7 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/ipc.c (modified) (14 diffs)

kernel/generic/src/ipc/ipc.c

@@ -154 +154 @@
 /** Connect a phone to an answerbox.
  *
- * @param phone Initialized phone structure.
- * @param box   Initialized answerbox structure.
- * @return      True if the phone was connected, false otherwise.
+ * This function must be passed a reference to phone->kobject.
+ *
+ * @param phone  Initialized phone structure.
+ * @param box    Initialized answerbox structure.
+ * @return       True if the phone was connected, false otherwise.
  */
 bool ipc_phone_connect(phone_t *phone, answerbox_t *box)
@@ -169 +171 @@
                 phone->state = IPC_PHONE_CONNECTED;
                 phone->callee = box;
+                /* Pass phone->kobject reference to box->connected_phones */
                 list_append(&phone->link, &box->connected_phones);
         }
@@ -174 +177 @@
         irq_spinlock_unlock(&box->lock, true);
         mutex_unlock(&phone->lock);
+
+        if (!active) {
+                /* We still have phone->kobject's reference; drop it */
+                kobject_put(phone->kobject);
+        }
 
         return active;
@@ -191 +199 @@
         phone->state = IPC_PHONE_FREE;
         atomic_set(&phone->active_calls, 0);
+        phone->kobject = NULL;
 }
 
@@ -456 +465 @@
                 list_remove(&phone->link);
                 irq_spinlock_unlock(&box->lock, true);
+
+                /* Drop the answerbox reference */
+                kobject_put(phone->kobject);
                 
                 call_t *call = ipc_call_alloc(0);
@@ -658 +670 @@
 
                         task_release(phone->caller);
+
+                        kobject_put(phone->kobject);
                         
                         /* Must start again */
@@ -664 +678 @@
                 
                 mutex_unlock(&phone->lock);
+                kobject_put(phone->kobject);
         }
         
@@ -734 +749 @@
 static bool phone_cap_wait_cb(cap_t *cap, void *arg)
 {
-        phone_t *phone = (phone_t *) cap->kobject;
+        phone_t *phone = cap->kobject->phone;
         bool *restart = (bool *) arg;
 
@@ -790 +805 @@
          */
         restart = false;
-        if (caps_apply_to_type(TASK, CAP_TYPE_PHONE, phone_cap_wait_cb,
-            &restart)) {
+        if (caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
+            phone_cap_wait_cb, &restart)) {
                 /* Got into cleanup */
                 return;
@@ -810 +825 @@
 static bool phone_cap_cleanup_cb(cap_t *cap, void *arg)
 {
-        phone_t *phone = (phone_t *) cap->kobject;
-        ipc_phone_hangup(phone);
+        ipc_phone_hangup(cap->kobject->phone);
         return true;
 }
@@ -840 +854 @@
 
         /* Disconnect all our phones ('ipc_phone_hangup') */
-        caps_apply_to_type(TASK, CAP_TYPE_PHONE, phone_cap_cleanup_cb, NULL);
+        caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE,
+            phone_cap_cleanup_cb, NULL);
         
         /* Unsubscribe from any event notifications. */
@@ -846 +861 @@
         
         /* Disconnect all connected IRQs */
-        caps_apply_to_type(TASK, CAP_TYPE_IRQ, irq_cap_cleanup_cb, NULL);
+        caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_IRQ, irq_cap_cleanup_cb,
+            NULL);
         
         /* Disconnect all phones connected to our regular answerbox */
@@ -912 +928 @@
 static bool print_task_phone_cb(cap_t *cap, void *arg)
 {
-        phone_t *phone = (phone_t *) cap->kobject;
+        phone_t *phone = cap->kobject->phone;
 
         mutex_lock(&phone->lock);
@@ -963 +979 @@
         printf("[phone cap] [calls] [state\n");
         
-        caps_apply_to_type(task, CAP_TYPE_PHONE, print_task_phone_cb, NULL);
+        caps_apply_to_kobject_type(task, KOBJECT_TYPE_PHONE,
+            print_task_phone_cb, NULL);
         
         irq_spinlock_lock(&task->lock, true);