Changes in kernel/generic/src/ipc/ipc.c [abf6c01:bab75df6] in mainline

File:

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

kernel/generic/src/ipc/ipc.c

@@ -108 +108 @@
  * TASK->answerbox.
  *
- * @return Initialized kernel call structure with one reference, or NULL.
- *
- */
-call_t *ipc_call_alloc(void)
-{
-        // TODO: Allocate call and kobject in single allocation
-
-        call_t *call = slab_alloc(call_cache, FRAME_ATOMIC);
+ * @param flags Parameters for slab_alloc (e.g FRAME_ATOMIC).
+ *
+ * @return If flags permit it, return NULL, or initialized kernel
+ *         call structure with one reference.
+ *
+ */
+call_t *ipc_call_alloc(unsigned int flags)
+{
+        call_t *call = slab_alloc(call_cache, flags);
         if (!call)
                 return NULL;
 
-        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t));
+        kobject_t *kobj;
+        if (flags & FRAME_ATOMIC)
+                kobj = (kobject_t *) malloc(sizeof(kobject_t));
+        else
+                kobj = (kobject_t *) nfmalloc(sizeof(kobject_t));
+
         if (!kobj) {
                 slab_free(call_cache, call);
@@ -213 +219 @@
 errno_t ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t *mybox = slab_alloc(answerbox_cache, FRAME_ATOMIC);
-        if (!mybox)
-                return ENOMEM;
-
+        answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
         ipc_answerbox_init(mybox, TASK);
 
@@ -480 +483 @@
                 kobject_put(phone->kobject);
 
-                call_t *call = phone->hangup_call;
-                phone->hangup_call = NULL;
-                assert(call);
-
+                call_t *call = ipc_call_alloc(0);
                 IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                 call->request_method = IPC_M_PHONE_HUNGUP;
@@ -685 +685 @@
                          * to exist as soon as we release it.
                          */
-                        call_t *call = phone->hangup_call;
-                        phone->hangup_call = NULL;
-                        assert(call);
-
+                        call_t *call = ipc_call_alloc(0);
                         IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
                         call->request_method = IPC_M_PHONE_HUNGUP;