Changeset e394c196 in mainline

Timestamp:

2018-11-12T20:53:57Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

705ca2b

Parents:

15639ec

git-author:

Jakub Jermar <jakub@…> (2018-08-28 19:55:29)

git-committer:

Jakub Jermar <jakub@…> (2018-11-12 20:53:57)

Message:

Use a dedicated cache for instances of kobject_t

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (1 diff)
• src/cap/cap.c (modified) (4 diffs)
• src/ipc/ipc.c (modified) (1 diff)
• src/ipc/ipcrsc.c (modified) (1 diff)
• src/ipc/irq.c (modified) (1 diff)
• src/synch/syswaitq.c (modified) (4 diffs)

kernel/generic/include/cap/cap.h

@@ -137 +137 @@
 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 *,
     kobject_ops_t *);

kernel/generic/src/cap/cap.c

@@ -93 +93 @@
 
 static slab_cache_t *cap_cache;
+static slab_cache_t *kobject_cache;
 
 static size_t caps_hash(const ht_link_t *item)
@@ -123 +124 @@
         cap_cache = slab_cache_create("cap_t", sizeof(cap_t), 0, NULL,
             NULL, 0);
+        kobject_cache = slab_cache_create("kobject_t", sizeof(kobject_t), 0,
+            NULL, NULL, 0);
 }
 
@@ -394 +397 @@
 }
 
+kobject_t *kobject_alloc(unsigned int flags)
+{
+        return slab_alloc(kobject_cache, flags);
+}
+
+void kobject_free(kobject_t *kobj)
+{
+        slab_free(kobject_cache, kobj);
+}
+
 /** Initialize kernel object
  *
@@ -462 +475 @@
         if (atomic_postdec(&kobj->refcnt) == 1) {
                 kobj->ops->destroy(kobj->raw);
-                free(kobj);
+                kobject_free(kobj);
         }
 }

kernel/generic/src/ipc/ipc.c

@@ -120 +120 @@
                 return NULL;
 
-        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t));
+        kobject_t *kobj = kobject_alloc(0);
         if (!kobj) {
                 slab_free(call_cache, call);

kernel/generic/src/ipc/ipcrsc.c

@@ -76 +76 @@
                         return ENOMEM;
                 }
-                kobject_t *kobj = malloc(sizeof(kobject_t));
+                kobject_t *kobj = kobject_alloc(FRAME_ATOMIC);
                 if (!kobj) {
                         cap_free(TASK, handle);

kernel/generic/src/ipc/irq.c

@@ -356 +356 @@
         }
 
-        kobject_t *kobject = malloc(sizeof(kobject_t));
+        kobject_t *kobject = kobject_alloc(FRAME_ATOMIC);
         if (!kobject) {
                 cap_free(TASK, handle);

kernel/generic/src/synch/syswaitq.c

@@ -45 +45 @@
 
 #include <stdint.h>
-#include <stdlib.h>
 
 static slab_cache_t *waitq_cache;
@@ -96 +95 @@
         waitq_initialize(wq);
 
-        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t));
+        kobject_t *kobj = kobject_alloc(0);
         if (!kobj) {
                 slab_free(waitq_cache, wq);
@@ -107 +106 @@
         if (rc != EOK) {
                 slab_free(waitq_cache, wq);
-                free(kobj);
+                kobject_free(kobj);
                 return (sys_errno_t) rc;
         }
@@ -114 +113 @@
         if (rc != EOK) {
                 cap_free(TASK, handle);
-                free(kobj);
+                kobject_free(kobj);
                 slab_free(waitq_cache, wq);
                 return (sys_errno_t) rc;