Changeset 05ffb41 in mainline for kernel/generic/src/kobject/kobject.c

Timestamp:

2017-08-17T19:11:14Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c85bae

Parents:

7e3826d9

Message:

Turn IPC phones into kobjects

File:

• kernel/generic/src/kobject/kobject.c (modified) (3 diffs)

kernel/generic/src/kobject/kobject.c

@@ -37 +37 @@
 #include <synch/spinlock.h>
 
-kobject_t *kobject_get_local(int cap, kobject_type_t type)
+void kobject_init(kobject_t *kobj)
+{
+        kobj->type = KOBJECT_TYPE_INVALID;
+        kobj->can_reclaim = NULL;
+}
+
+kobject_t *kobject_get(task_t *task, int cap, kobject_type_t type)
 {
         if ((cap < 0) || (cap >= MAX_KERNEL_OBJECTS))
                 return NULL;
-        if (TASK->kobject[cap].type != type)
+        if (task->kobject[cap].type != type)
                 return NULL;
-        return &TASK->kobject[cap];
+        return &task->kobject[cap];
+}
+
+kobject_t *kobject_get_current(int cap, kobject_type_t type)
+{
+        return kobject_get(TASK, cap, type);
 }
 
@@ -52 +63 @@
         irq_spinlock_lock(&task->lock, true);
         for (cap = 0; cap < MAX_KERNEL_OBJECTS; cap++) {
-                if (task->kobject[cap].type == KOBJECT_TYPE_INVALID) {
-                        task->kobject[cap].type = KOBJECT_TYPE_ALLOCATED;
+                kobject_t *kobj = &task->kobject[cap];
+                if (kobj->type > KOBJECT_TYPE_ALLOCATED) {
+                        if (kobj->can_reclaim && kobj->can_reclaim(kobj))
+                                kobject_init(kobj);
+                }
+                if (kobj->type == KOBJECT_TYPE_INVALID) {
+                        kobj->type = KOBJECT_TYPE_ALLOCATED;
                         irq_spinlock_unlock(&task->lock, true);
                         return cap;
@@ -70 +86 @@
 
         irq_spinlock_lock(&task->lock, true);
-        task->kobject[cap].type = KOBJECT_TYPE_INVALID;
+        kobject_init(&task->kobject[cap]);
         irq_spinlock_unlock(&task->lock, true);
 }