Changes in kernel/generic/src/ipc/ipc.c [c1f68b0:d51a0d6] in mainline

File:

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

kernel/generic/src/ipc/ipc.c

@@ -87 +87 @@
 }
 
-void ipc_call_hold(call_t *call)
-{
-        atomic_inc(&call->refcnt);
-}
-
-void ipc_call_release(call_t *call)
-{
-        if (atomic_predec(&call->refcnt) == 0) {
-                if (call->buffer)
-                        free(call->buffer);
-                if (call->caller_phone)
-                        kobject_put(call->caller_phone->kobject);
-                slab_free(call_slab, call);
-        }
-}
+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);
+        slab_free(call_slab, call);
+}
+
+static kobject_ops_t call_kobject_ops = {
+        .destroy = call_destroy
+};
 
 /** Allocate and initialize a call structure.
@@ -117 +116 @@
 {
         call_t *call = slab_alloc(call_slab, flags);
-        if (call) {
-                _ipc_call_init(call);
-                ipc_call_hold(call);
-        }
+        if (!call)
+                return NULL;
+        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t), flags);
+        if (!kobj) {
+                slab_free(call_slab, call);
+                return NULL;
+        }
+
+        _ipc_call_init(call);
+        kobject_initialize(kobj, KOBJECT_TYPE_CALL, call, &call_kobject_ops);
+        call->kobject = kobj;
         
         return call;
-}
-
-/** Deallocate a call structure.
- *
- * @param call Call structure to be freed.
- *
- */
-void ipc_call_free(call_t *call)
-{
-        ipc_call_release(call);
 }
 
@@ -290 +286 @@
                 /* This is a forgotten call and call->sender is not valid. */
                 spinlock_unlock(&call->forget_lock);
-                ipc_call_free(call);
+                kobject_put(call->kobject);
                 return;
         } else {
@@ -705 +701 @@
          * must hold a reference to it.
          */
-        ipc_call_hold(call);
+        kobject_add_ref(call->kobject);
 
         spinlock_unlock(&call->forget_lock);
@@ -714 +710 @@
         SYSIPC_OP(request_forget, call);
 
-        ipc_call_release(call);
+        kobject_put(call->kobject);
 }
 
@@ -822 +818 @@
         SYSIPC_OP(answer_process, call);
 
-        ipc_call_free(call);
+        kobject_put(call->kobject);
         goto restart;
 }