Changeset 63d8f43 in mainline for kernel/generic/src/ipc/ipcrsc.c

Timestamp:

2017-09-04T19:38:28Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fa32c9f

Parents:

30c27e9

Message:

Allocate the kobjects referenced by capabilities dynamically

File:

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

kernel/generic/src/ipc/ipcrsc.c

@@ -135 +135 @@
 #include <abi/errno.h>
 #include <cap/cap.h>
+#include <mm/slab.h>
 
 /** Find call_t * in call table according to callid.
@@ -178 +179 @@
                 return NULL;
         
-        return &cap->phone;
+        return (phone_t *) cap->kobject;
 }
 
@@ -190 +191 @@
         assert(cap->type == CAP_TYPE_PHONE);
 
-        return (cap->phone.state == IPC_PHONE_HUNGUP) &&
-            (atomic_get(&cap->phone.active_calls) == 0);
+        phone_t *phone = (phone_t *) cap->kobject;
+
+        return (phone->state == IPC_PHONE_HUNGUP) &&
+            (atomic_get(&phone->active_calls) == 0);
 }
 
@@ -205 +208 @@
         int handle = cap_alloc(task);
         if (handle >= 0) {
+                phone_t *phone = malloc(sizeof(phone_t), FRAME_ATOMIC);
+                if (!phone) {
+                        cap_free(TASK, handle);
+                        return ENOMEM;
+                }
+                
+                ipc_phone_init(phone, task);
+                phone->state = IPC_PHONE_CONNECTING;
+                
                 irq_spinlock_lock(&task->lock, true);
                 cap_t *cap = cap_get(task, handle, CAP_TYPE_ALLOCATED);
-                ipc_phone_init(&cap->phone, task);
                 cap->type = CAP_TYPE_PHONE;
+                cap->kobject = (void *) phone;
                 cap->can_reclaim = phone_can_reclaim;
-                cap->phone.state = IPC_PHONE_CONNECTING;
                 irq_spinlock_unlock(&task->lock, true);
         }
@@ -226 +237 @@
 void phone_dealloc(int handle)
 {
-        phone_t *phone = phone_get_current(handle);
+        irq_spinlock_lock(&TASK->lock, true);
+        cap_t *cap = cap_get_current(handle, CAP_TYPE_PHONE);
+        assert(cap);
+        cap->type = CAP_TYPE_ALLOCATED;
+        irq_spinlock_unlock(&TASK->lock, true);
+        
+        phone_t *phone = (phone_t *) cap->kobject;
         
         assert(phone);
         assert(phone->state == IPC_PHONE_CONNECTING);
-
+        
+        free(phone);
         cap_free(TASK, handle);
 }