Changeset fc0de8c in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2019-10-14T15:30:30Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46a8c3cd

Parents:

f1cd4b0

git-author:

Jakub Jermar <jakub@…> (2019-10-14 15:27:34)

git-committer:

Jakub Jermar <jakub@…> (2019-10-14 15:30:30)

Message:

Move kobject's ops out of kobject

Kobject ops is a property of the kobject type rather than the individual
kernel objects. There is no need to remember the ops in every single
instance.

File:

• kernel/generic/src/cap/cap.c (modified) (5 diffs)

kernel/generic/src/cap/cap.c

@@ -83 +83 @@
 #include <mm/slab.h>
 #include <adt/list.h>
+#include <synch/syswaitq.h>
+#include <ipc/ipcrsc.h>
+#include <ipc/ipc.h>
+#include <ipc/irq.h>
 
 #include <limits.h>
@@ -94 +98 @@
 static slab_cache_t *cap_cache;
 static slab_cache_t *kobject_cache;
+
+kobject_ops_t *kobject_ops[KOBJECT_TYPE_MAX] = {
+        [KOBJECT_TYPE_CALL] = &call_kobject_ops,
+        [KOBJECT_TYPE_IRQ] = &irq_kobject_ops,
+        [KOBJECT_TYPE_PHONE] = &phone_kobject_ops,
+        [KOBJECT_TYPE_WAITQ] = &waitq_kobject_ops
+};
 
 static size_t caps_hash(const ht_link_t *item)
@@ -412 +423 @@
  * @param type  Type of the kernel object.
  * @param raw   Raw pointer to the encapsulated object.
- * @param ops   Pointer to kernel object operations for the respective type.
- */
-void kobject_initialize(kobject_t *kobj, kobject_type_t type, void *raw,
-    kobject_ops_t *ops)
+ */
+void kobject_initialize(kobject_t *kobj, kobject_type_t type, void *raw)
 {
         atomic_store(&kobj->refcnt, 1);
@@ -424 +433 @@
         kobj->type = type;
         kobj->raw = raw;
-        kobj->ops = ops;
 }
 
@@ -474 +482 @@
 {
         if (atomic_postdec(&kobj->refcnt) == 1) {
-                kobj->ops->destroy(kobj->raw);
+                KOBJECT_OP(kobj)->destroy(kobj->raw);
                 kobject_free(kobj);
         }