Changeset fc0de8c in mainline for kernel/generic/include

Timestamp:

2019-10-14T15:30:30Z (6 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.

Location:

kernel/generic/include

Files:

• cap/cap.h (modified) (3 diffs)
• ipc/ipc.h (modified) (1 diff)
• ipc/ipcrsc.h (modified) (1 diff)
• ipc/irq.h (modified) (1 diff)
• synch/syswaitq.h (modified) (1 diff)

kernel/generic/include/cap/cap.h

@@ -70 +70 @@
 } kobject_ops_t;
 
+extern kobject_ops_t *kobject_ops[];
+
+#define KOBJECT_OP(k)   kobject_ops[(k)->type]
+
 /*
  * Everything in kobject_t except for the atomic reference count, the capability
@@ -82 +86 @@
         /** List of published capabilities associated with the kobject */
         list_t caps_list;
-
-        kobject_ops_t *ops;
 
         union {
@@ -139 +141 @@
 extern kobject_t *kobject_alloc(unsigned int);
 extern void kobject_free(kobject_t *);
-extern void kobject_initialize(kobject_t *, kobject_type_t, void *,
-    kobject_ops_t *);
+extern void kobject_initialize(kobject_t *, kobject_type_t, void *);
 extern kobject_t *kobject_get(struct task *, cap_handle_t, kobject_type_t);
 extern void kobject_add_ref(kobject_t *);

kernel/generic/include/ipc/ipc.h

@@ -172 +172 @@
 extern answerbox_t *ipc_box_0;
 
+extern kobject_ops_t call_kobject_ops;
+
 extern void ipc_init(void);
 

kernel/generic/include/ipc/ipcrsc.h

@@ -40 +40 @@
 #include <cap/cap.h>
 
+extern kobject_ops_t phone_kobject_ops;
+
 extern errno_t phone_alloc(task_t *, bool, cap_phone_handle_t *, kobject_t **);
 extern void phone_dealloc(cap_phone_handle_t);

kernel/generic/include/ipc/irq.h

@@ -46 +46 @@
 #include <typedefs.h>
 #include <adt/list.h>
+#include <cap/cap.h>
+
+extern kobject_ops_t irq_kobject_ops;
 
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);

kernel/generic/include/synch/syswaitq.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <abi/cap.h>
+#include <cap/cap.h>
+
+extern kobject_ops_t waitq_kobject_ops;
 
 extern void sys_waitq_init(void);