Changeset 455241b in mainline for kernel/generic/include

Timestamp:

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

Author:

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

Children:

162ad53

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/include

Files:

• cap/cap.h (modified) (4 diffs)
• ddi/irq.h (modified) (1 diff)
• ipc/ipc.h (modified) (3 diffs)
• ipc/irq.h (modified) (1 diff)

kernel/generic/include/cap/cap.h

@@ -60 +60 @@
 } kobject_type_t;
 
-struct task;
-
-struct call;
-struct irq;
-struct phone;
-struct waitq;
+struct kobject;
 
 typedef struct kobject_ops {
-        void (*destroy)(void *);
+        void (*destroy)(struct kobject *);
 } kobject_ops_t;
 
@@ -77 +72 @@
 /*
  * Everything in kobject_t except for the atomic reference count, the capability
- * list and its lock is imutable.
+ * list and its lock is immutable.
  */
 typedef struct kobject {
@@ -87 +82 @@
         /** List of published capabilities associated with the kobject */
         list_t caps_list;
-
-        union {
-                void *raw;
-                struct call *call;
-                struct irq *irq;
-                struct phone *phone;
-                struct waitq *waitq;
-        };
 } kobject_t;
 
@@ -141 +128 @@
 extern void cap_free(struct task *, cap_handle_t);
 
-extern kobject_t *kobject_alloc(unsigned int);
-extern void kobject_free(kobject_t *);
-extern void kobject_initialize(kobject_t *, kobject_type_t, void *);
+extern void kobject_initialize(kobject_t *, kobject_type_t);
 extern kobject_t *kobject_get(struct task *, cap_handle_t, kobject_type_t);
 extern void kobject_add_ref(kobject_t *);

kernel/generic/include/ddi/irq.h

@@ -132 +132 @@
 extern hash_table_t irq_uspace_hash_table;
 
-extern slab_cache_t *irq_cache;
-
 extern inr_t last_inr;
 

kernel/generic/include/ipc/ipc.h

@@ -74 +74 @@
         /** User-defined label */
         sysarg_t label;
-        kobject_t *kobject;
+        kobject_t kobject;
 } phone_t;
 
@@ -108 +108 @@
 
 typedef struct call {
-        kobject_t *kobject;
+        kobject_t kobject;
 
         /**
@@ -169 +169 @@
 
 extern slab_cache_t *phone_cache;
+extern slab_cache_t *irq_cache;
 
 extern answerbox_t *ipc_box_0;
 
 extern kobject_ops_t call_kobject_ops;
+
+static inline phone_t *phone_from_kobject(kobject_t *kobject)
+{
+        if (kobject)
+                return ((void *) kobject) - offsetof(phone_t, kobject);
+        else
+                return NULL;
+}
+
+static inline call_t *call_from_kobject(kobject_t *kobject)
+{
+        if (kobject)
+                return ((void *) kobject) - offsetof(call_t, kobject);
+        else
+                return NULL;
+}
 
 extern void ipc_init(void);

kernel/generic/include/ipc/irq.h

@@ -50 +50 @@
 extern kobject_ops_t irq_kobject_ops;
 
+typedef struct {
+        kobject_t kobject;
+        irq_t irq;
+} irq_kobject_t;
+
+static inline irq_t *irq_from_kobject(kobject_t *kobject)
+{
+        if (kobject) {
+                return &((irq_kobject_t *) kobject)->irq;
+        } else {
+                return NULL;
+        }
+}
+
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);
 extern void ipc_irq_top_half_handler(irq_t *);