Changeset 455241b in mainline for kernel/generic/src/ipc/ops

Timestamp:

2025-01-16T19:29:20Z (12 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

ff4d31c

Parents:

df721df

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-01-16 19:23:14)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-01-16 19:29:20)

Message:

Integrate kobject_t into target structures

This just means fewer allocations and indirections.

Location:

kernel/generic/src/ipc/ops

Files:

• conctmeto.c (modified) (2 diffs)
• concttome.c (modified) (2 diffs)
• stchngath.c (modified) (3 diffs)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -88 +88 @@
 
         /* Set the recipient-assigned label */
-        pobj->phone->label = ipc_get_arg5(&answer->data);
+        phone_from_kobject(pobj)->label = ipc_get_arg5(&answer->data);
 
         /* Restore phone handle in answer's ARG5 */
@@ -96 +96 @@
         if (ipc_get_retval(&answer->data) == EOK) {
                 /* Hand over reference from pobj to the answerbox */
-                (void) ipc_phone_connect(pobj->phone, &TASK->answerbox);
+                (void) ipc_phone_connect(phone_from_kobject(pobj), &TASK->answerbox);
         } else {
                 /* Drop the extra reference */

kernel/generic/src/ipc/ops/concttome.c

@@ -49 +49 @@
                  * Set the sender-assigned label to the new phone.
                  */
-                pobj->phone->label = ipc_get_arg5(&call->data);
+                phone_from_kobject(pobj)->label = ipc_get_arg5(&call->data);
         }
         call->priv = (sysarg_t) pobj;
@@ -88 +88 @@
                 kobject_add_ref(pobj);
 
-                if (ipc_phone_connect(pobj->phone,
+                if (ipc_phone_connect(phone_from_kobject(pobj),
                     &answer->sender->answerbox)) {
                         /* Pass the reference to the capability */

kernel/generic/src/ipc/ops/stchngath.c

@@ -45 +45 @@
         task_t *other_task_s;
 
-        kobject_t *sender_obj = kobject_get(TASK,
-            (cap_handle_t) ipc_get_arg5(&call->data), KOBJECT_TYPE_PHONE);
-        if (!sender_obj)
+        phone_t *sender_phone = phone_from_kobject(kobject_get(TASK,
+            (cap_handle_t) ipc_get_arg5(&call->data), KOBJECT_TYPE_PHONE));
+        if (!sender_phone)
                 return ENOENT;
 
-        mutex_lock(&sender_obj->phone->lock);
-        if (sender_obj->phone->state != IPC_PHONE_CONNECTED) {
-                mutex_unlock(&sender_obj->phone->lock);
-                kobject_put(sender_obj);
+        mutex_lock(&sender_phone->lock);
+        if (sender_phone->state != IPC_PHONE_CONNECTED) {
+                mutex_unlock(&sender_phone->lock);
+                kobject_put(&sender_phone->kobject);
                 return EINVAL;
         }
 
-        other_task_s = sender_obj->phone->callee->task;
+        other_task_s = sender_phone->callee->task;
 
-        mutex_unlock(&sender_obj->phone->lock);
+        mutex_unlock(&sender_phone->lock);
 
         /* Remember the third party task hash. */
         ipc_set_arg5(&call->data, (sysarg_t) other_task_s);
 
-        kobject_put(sender_obj);
+        kobject_put(&sender_phone->kobject);
         return EOK;
 }
@@ -77 +77 @@
                 task_t *other_task_r;
 
-                kobject_t *recipient_obj = kobject_get(TASK,
+                phone_t *recipient_phone = phone_from_kobject(kobject_get(TASK,
                     (cap_handle_t) ipc_get_arg1(&answer->data),
-                    KOBJECT_TYPE_PHONE);
-                if (!recipient_obj) {
+                    KOBJECT_TYPE_PHONE));
+                if (!recipient_phone) {
                         ipc_set_retval(&answer->data, ENOENT);
                         return ENOENT;
                 }
 
-                mutex_lock(&recipient_obj->phone->lock);
-                if (recipient_obj->phone->state != IPC_PHONE_CONNECTED) {
-                        mutex_unlock(&recipient_obj->phone->lock);
+                mutex_lock(&recipient_phone->lock);
+                if (recipient_phone->state != IPC_PHONE_CONNECTED) {
+                        mutex_unlock(&recipient_phone->lock);
                         ipc_set_retval(&answer->data, EINVAL);
-                        kobject_put(recipient_obj);
+                        kobject_put(&recipient_phone->kobject);
                         return EINVAL;
                 }
 
-                other_task_r = recipient_obj->phone->callee->task;
+                other_task_r = recipient_phone->callee->task;
                 other_task_s = (task_t *) ipc_get_arg5(olddata);
 
@@ -114 +114 @@
                 }
 
-                mutex_unlock(&recipient_obj->phone->lock);
-                kobject_put(recipient_obj);
+                mutex_unlock(&recipient_phone->lock);
+                kobject_put(&recipient_phone->kobject);
         }