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

File:

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

kernel/generic/src/ipc/ipc.c

@@ -66 +66 @@
 answerbox_t *ipc_phone_0 = NULL;
 
-static slab_cache_t *call_cache;
-static slab_cache_t *answerbox_cache;
-
-slab_cache_t *phone_cache = NULL; 
+static slab_cache_t *call_slab;
+static slab_cache_t *answerbox_slab;
+
+slab_cache_t *phone_slab = NULL; 
 
 /** Initialize a call structure.
@@ -87 +87 @@
 }
 
-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_cache, call);
-}
-
-static kobject_ops_t call_kobject_ops = {
-        .destroy = call_destroy
-};
+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);
+        }
+}
 
 /** Allocate and initialize a call structure.
@@ -115 +116 @@
 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), flags);
-        if (!kobj) {
-                slab_free(call_cache, call);
-                return NULL;
-        }
-
-        _ipc_call_init(call);
-        kobject_initialize(kobj, KOBJECT_TYPE_CALL, call, &call_kobject_ops);
-        call->kobject = kobj;
+        call_t *call = slab_alloc(call_slab, flags);
+        if (call) {
+                _ipc_call_init(call);
+                ipc_call_hold(call);
+        }
         
         return call;
+}
+
+/** Deallocate a call structure.
+ *
+ * @param call Call structure to be freed.
+ *
+ */
+void ipc_call_free(call_t *call)
+{
+        ipc_call_release(call);
 }
 
@@ -205 +209 @@
  * @param request Call structure with request.
  *
- * @return EOK on success or an error code.
+ * @return EOK on success or a negative error code.
  *
  */
 int ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
+        answerbox_t *mybox = slab_alloc(answerbox_slab, 0);
         ipc_answerbox_init(mybox, TASK);
         
@@ -218 +222 @@
         int rc = ipc_call(phone, request);
         if (rc != EOK) {
-                slab_free(answerbox_cache, mybox);
+                slab_free(answerbox_slab, mybox);
                 return rc;
         }
@@ -265 +269 @@
         assert(!answer || request == answer);
         
-        slab_free(answerbox_cache, mybox);
+        slab_free(answerbox_slab, mybox);
         return rc;
 }
@@ -286 +290 @@
                 /* This is a forgotten call and call->sender is not valid. */
                 spinlock_unlock(&call->forget_lock);
-                kobject_put(call->kobject);
+                ipc_call_free(call);
                 return;
         } else {
@@ -371 +375 @@
  *
  */
-void ipc_backsend_err(phone_t *phone, call_t *call, int err)
+void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
 {
         _ipc_call_actions_internal(phone, call, false);
@@ -444 +448 @@
  * @param phone Phone structure to be hung up.
  *
- * @return EOK if the phone is disconnected.
- * @return EINVAL if the phone was already disconnected.
+ * @return 0 if the phone is disconnected.
+ * @return -1 if the phone was already disconnected.
  *
  */
@@ -455 +459 @@
             phone->state == IPC_PHONE_CONNECTING) {
                 mutex_unlock(&phone->lock);
-                return EINVAL;
+                return -1;
         }
         
@@ -478 +482 @@
         mutex_unlock(&phone->lock);
         
-        return EOK;
+        return 0;
 }
 
@@ -538 +542 @@
         
 restart:
-        rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL);
-        if (rc != EOK)
+        rc = waitq_sleep_timeout(&box->wq, usec, flags);
+        if (SYNCH_FAILED(rc))
                 return NULL;
         
@@ -638 +642 @@
                 phone = list_get_instance(list_first(&box->connected_phones),
                     phone_t, link);
-                if (mutex_trylock(&phone->lock) != EOK) {
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
                         irq_spinlock_unlock(&box->lock, true);
                         DEADLOCK_PROBE(p_phonelck, DEADLOCK_THRESHOLD);
@@ -701 +705 @@
          * must hold a reference to it.
          */
-        kobject_add_ref(call->kobject);
+        ipc_call_hold(call);
 
         spinlock_unlock(&call->forget_lock);
@@ -710 +714 @@
         SYSIPC_OP(request_forget, call);
 
-        kobject_put(call->kobject);
+        ipc_call_release(call);
 }
 
@@ -818 +822 @@
         SYSIPC_OP(answer_process, call);
 
-        kobject_put(call->kobject);
+        ipc_call_free(call);
         goto restart;
 }
@@ -835 +839 @@
 {
         ipc_irq_unsubscribe(&TASK->answerbox, cap->handle);
-        return true;
-}
-
-static bool call_cap_cleanup_cb(cap_t *cap, void *arg)
-{
-        /*
-         * Here we just free the capability and release the kobject.
-         * The kernel answers the remaining calls elsewhere in ipc_cleanup().
-         */
-        kobject_t *kobj = cap_unpublish(cap->task, cap->handle,
-            KOBJECT_TYPE_CALL);
-        kobject_put(kobj);
-        cap_free(cap->task, cap->handle);
         return true;
 }
@@ -887 +878 @@
         ipc_kbox_cleanup();
 #endif
-
-        /* Destroy all call capabilities */
-        caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_CALL, call_cap_cleanup_cb,
-            NULL);
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues */
@@ -906 +893 @@
 void ipc_init(void)
 {
-        call_cache = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
+        call_slab = slab_cache_create("call_t", sizeof(call_t), 0, NULL,
             NULL, 0);
-        phone_cache = slab_cache_create("phone_t", sizeof(phone_t), 0, NULL,
+        phone_slab = slab_cache_create("phone_t", sizeof(phone_t), 0, NULL,
             NULL, 0);
-        answerbox_cache = slab_cache_create("answerbox_t", sizeof(answerbox_t),
+        answerbox_slab = slab_cache_create("answerbox_t", sizeof(answerbox_t),
             0, NULL, NULL, 0);
 }