Changeset e68765e in mainline

Timestamp:

2017-08-20T16:58:10Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88db88d

Parents:

3f74275

Message:

Store capability's handle inside of it

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (3 diffs)
• src/cap/cap.c (modified) (4 diffs)
• src/ipc/ipc.c (modified) (1 diff)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/cap/cap.h

@@ -59 +59 @@
 typedef struct cap {
         cap_type_t type;
+        int handle;
+
         bool (* can_reclaim)(struct cap *);
 
@@ -74 +76 @@
 void caps_task_init(struct task *);
 
-extern void cap_initialize(cap_t *);
+extern void cap_initialize(cap_t *, int);
 extern cap_t *cap_get(struct task *, int, cap_type_t);
 extern cap_t *cap_get_current(int, cap_type_t);
@@ -80 +82 @@
 extern void cap_free(struct task *, int);
 
-extern int cap_get_handle(struct task *, cap_t *);
-
 #endif
 

kernel/generic/src/cap/cap.c

@@ -39 +39 @@
 #include <mm/slab.h>
 
-void cap_initialize(cap_t *cap)
+void cap_initialize(cap_t *cap, int handle)
 {
         cap->type = CAP_TYPE_INVALID;
+        cap->handle = handle;
         cap->can_reclaim = NULL;
 }
@@ -53 +54 @@
 {
         for (int i = 0; i < MAX_CAPS; i++)
-                cap_initialize(&task->caps[i]);
+                cap_initialize(&task->caps[i], i);
 }
 
@@ -84 +85 @@
                 if (cap->type > CAP_TYPE_ALLOCATED) {
                         if (cap->can_reclaim && cap->can_reclaim(cap))
-                                cap_initialize(cap);
+                                cap_initialize(cap, handle);
                 }
                 if (cap->type == CAP_TYPE_INVALID) {
@@ -104 +105 @@
 
         irq_spinlock_lock(&task->lock, true);
-        cap_initialize(&task->caps[handle]);
+        cap_initialize(&task->caps[handle], handle);
         irq_spinlock_unlock(&task->lock, true);
-}
-
-int cap_get_handle(task_t *task, cap_t *cap)
-{
-        return cap - task->caps;
 }
 

kernel/generic/src/ipc/ipc.c

@@ -913 +913 @@
         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_handle);
+                        printf("%-11d (mutex busy)\n", cap->handle);
                         continue;
                 }
                 
                 if (phone->state != IPC_PHONE_FREE) {
-                        printf("%-11d %7" PRIun " ", cap_handle,
+                        printf("%-11d %7" PRIun " ", cap->handle,
                             atomic_get(&phone->active_calls));
                         

kernel/generic/src/proc/task.c

@@ -627 +627 @@
                         phone_t *phone = &cap->phone;
                         if (phone->callee)
-                                printf(" %d:%p", cap_get_handle(task, cap),
-                                    phone->callee);
+                                printf(" %d:%p", cap->handle, phone->callee);
                 }
                 printf("\n");