Changeset 3f74275 in mainline for kernel/generic/src/ipc/ipc.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/ipc/ipc.c (modified) (4 diffs)

kernel/generic/src/ipc/ipc.c

@@ -59 +59 @@
 #include <arch/interrupt.h>
 #include <ipc/irq.h>
-#include <kobject/kobject.h>
+#include <cap/cap.h>
 
 static void ipc_forget_call(call_t *);
@@ -743 +743 @@
          */
         all_clean = true;
-        for_each_kobject_current(kobj, KOBJECT_TYPE_PHONE) {
-                phone_t *phone = &kobj->phone;
+        for_each_cap_current(cap, CAP_TYPE_PHONE) {
+                phone_t *phone = &cap->phone;
 
                 mutex_lock(&phone->lock);
@@ -820 +820 @@
 
         /* Disconnect all our phones ('ipc_phone_hangup') */
-        for_each_kobject_current(kobj, KOBJECT_TYPE_PHONE) {
-                phone_t *phone = &kobj->phone;
+        for_each_cap_current(cap, CAP_TYPE_PHONE) {
+                phone_t *phone = &cap->phone;
                 ipc_phone_hangup(phone);
         }
@@ -911 +911 @@
         printf("[phone cap] [calls] [state\n");
         
-        for_each_kobject(task, kobj, KOBJECT_TYPE_PHONE) {
-                phone_t *phone = &kobj->phone;
-                int cap = kobject_to_cap(task, kobj);
-
+        for_each_cap(task, cap, CAP_TYPE_PHONE) {
+                phone_t *phone = &cap->phone;
+                int cap_handle = cap_get_handle(task, cap);
+        
                 if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
-                        printf("%-11d (mutex busy)\n", cap);
+                        printf("%-11d (mutex busy)\n", cap_handle);
                         continue;
                 }
                 
                 if (phone->state != IPC_PHONE_FREE) {
-                        printf("%-11d %7" PRIun " ", cap,
+                        printf("%-11d %7" PRIun " ", cap_handle,
                             atomic_get(&phone->active_calls));