Changes in kernel/generic/src/ipc/ipc.c [455241b:07d4271] in mainline

File:

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

kernel/generic/src/ipc/ipc.c

@@ -71 +71 @@
 static slab_cache_t *answerbox_cache;
 
-slab_cache_t *irq_cache = NULL;
 slab_cache_t *phone_cache = NULL;
 
@@ -88 +87 @@
         call->callerbox = NULL;
         call->buffer = NULL;
-        kobject_initialize(&call->kobject, KOBJECT_TYPE_CALL);
-}
-
-static void call_destroy(kobject_t *arg)
-{
-        call_t *call = call_from_kobject(arg);
+}
+
+static void call_destroy(void *arg)
+{
+        call_t *call = (call_t *) arg;
 
         if (call->buffer)
                 free(call->buffer);
         if (call->caller_phone)
-                kobject_put(&call->caller_phone->kobject);
+                kobject_put(call->caller_phone->kobject);
         slab_free(call_cache, call);
 }
@@ -116 +114 @@
 call_t *ipc_call_alloc(void)
 {
+        // TODO: Allocate call and kobject in single allocation
+
         call_t *call = slab_alloc(call_cache, FRAME_ATOMIC);
         if (!call)
                 return NULL;
 
+        kobject_t *kobj = kobject_alloc(0);
+        if (!kobj) {
+                slab_free(call_cache, call);
+                return NULL;
+        }
+
         _ipc_call_init(call);
+        kobject_initialize(kobj, KOBJECT_TYPE_CALL, call);
+        call->kobject = kobj;
 
         return call;
@@ -173 +181 @@
         if (!connected) {
                 /* We still have phone->kobject's reference; drop it */
-                kobject_put(&phone->kobject);
+                kobject_put(phone->kobject);
         }
 
@@ -193 +201 @@
         atomic_store(&phone->active_calls, 0);
         phone->label = 0;
-        kobject_initialize(&phone->kobject, KOBJECT_TYPE_PHONE);
+        phone->kobject = NULL;
 }
 
@@ -286 +294 @@
                 /* This is a forgotten call and call->sender is not valid. */
                 spinlock_unlock(&call->forget_lock);
-                kobject_put(&call->kobject);
+                kobject_put(call->kobject);
                 return;
         } else {
@@ -344 +352 @@
 
         call->caller_phone = phone;
-        kobject_add_ref(&phone->kobject);
+        kobject_add_ref(phone->kobject);
 
         if (preforget) {
@@ -354 +362 @@
                 else
                         atomic_inc(&caller->answerbox.active_calls);
-                kobject_add_ref(&phone->kobject);
+                kobject_add_ref(phone->kobject);
                 call->sender = caller;
                 call->active = true;
@@ -471 +479 @@
 
                 /* Drop the answerbox reference */
-                kobject_put(&phone->kobject);
+                kobject_put(phone->kobject);
 
                 call_t *call = phone->hangup_call;
@@ -573 +581 @@
                 atomic_dec(&request->caller_phone->active_calls);
                 atomic_dec(&box->active_calls);
-                kobject_put(&request->caller_phone->kobject);
+                kobject_put(request->caller_phone->kobject);
         } else if (!list_empty(&box->calls)) {
                 /* Count received call */
@@ -689 +697 @@
                         task_release(phone->caller);
 
-                        kobject_put(&phone->kobject);
+                        kobject_put(phone->kobject);
 
                         /* Must start again */
@@ -696 +704 @@
 
                 mutex_unlock(&phone->lock);
-                kobject_put(&phone->kobject);
+                kobject_put(phone->kobject);
         }
 
@@ -720 +728 @@
          * must hold a reference to it.
          */
-        kobject_add_ref(&call->kobject);
+        kobject_add_ref(call->kobject);
 
         spinlock_unlock(&call->forget_lock);
@@ -727 +735 @@
         atomic_dec(&call->caller_phone->active_calls);
         atomic_dec(&TASK->answerbox.active_calls);
-        kobject_put(&call->caller_phone->kobject);
+        kobject_put(call->caller_phone->kobject);
 
         SYSIPC_OP(request_forget, call);
 
-        kobject_put(&call->kobject);
+        kobject_put(call->kobject);
 }
 
@@ -769 +777 @@
 static bool phone_cap_cleanup_cb(cap_t *cap, void *arg)
 {
-        ipc_phone_hangup(phone_from_kobject(cap->kobject));
+        ipc_phone_hangup(cap->kobject->phone);
         kobject_t *kobj = cap_unpublish(cap->task, cap->handle,
             KOBJECT_TYPE_PHONE);
@@ -790 +798 @@
                 SYSIPC_OP(answer_process, call);
 
-                kobject_put(&call->kobject);
+                kobject_put(call->kobject);
 
                 /*
@@ -884 +892 @@
         answerbox_cache = slab_cache_create("answerbox_t", sizeof(answerbox_t),
             0, NULL, NULL, 0);
-        irq_cache = slab_cache_create("irq_t", sizeof(irq_kobject_t),
-            0, NULL, NULL, 0);
 }
 
@@ -921 +927 @@
 static bool print_task_phone_cb(cap_t *cap, void *arg)
 {
-        phone_t *phone = phone_from_kobject(cap->kobject);
+        phone_t *phone = cap->kobject->phone;
 
         mutex_lock(&phone->lock);