Changeset 3f74275 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2017-08-20T16:45:01Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e68765e

Parents:

e7ac23d0

Message:

Fix terminology around capabilities, capability handles and kernel objects

File:

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

kernel/generic/src/proc/task.c

@@ -50 +50 @@
 #include <adt/btree.h>
 #include <adt/list.h>
-#include <kobject/kobject.h>
+#include <cap/cap.h>
 #include <ipc/ipc.h>
 #include <ipc/ipcrsc.h>
@@ -169 +169 @@
         list_initialize(&task->threads);
         
-        kobject_task_alloc(task);
+        caps_task_alloc(task);
         
         ipc_answerbox_init(&task->answerbox, task);
@@ -190 +190 @@
         task_t *task = (task_t *) obj;
         
-        kobject_task_free(task);
+        caps_task_free(task);
         return 0;
 }
@@ -215 +215 @@
         task->kcycles = 0;
 
-        kobject_task_init(task);
+        caps_task_init(task);
 
         task->ipc_info.call_sent = 0;
@@ -624 +624 @@
         
         if (*additional) {
-                for_each_kobject(task, ko, KOBJECT_TYPE_PHONE) {
-                        phone_t *phone = &ko->phone;
+                for_each_cap(task, cap, CAP_TYPE_PHONE) {
+                        phone_t *phone = &cap->phone;
                         if (phone->callee)
-                                printf(" %d:%p", kobject_to_cap(task, ko),
+                                printf(" %d:%p", cap_get_handle(task, cap),
                                     phone->callee);
                 }