Changeset e7ac23d0 in mainline

Timestamp:

2017-08-20T14:53:21Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3f74275

Parents:

49115ac

Message:

Hide kobject implementation details

Location:

kernel/generic

Files:

• include/kobject/kobject.h (modified) (3 diffs)
• src/ipc/ipc.c (modified) (6 diffs)
• src/kobject/kobject.c (modified) (3 diffs)
• src/proc/task.c (modified) (4 diffs)

kernel/generic/include/kobject/kobject.h

@@ -42 +42 @@
 #define MAX_KERNEL_OBJECTS  64
 
+#define for_each_kobject(task, ko, type) \
+        for (int i = 0, l = 1; i < MAX_KERNEL_OBJECTS && l; i++) \
+                for (kobject_t *(ko) = kobject_get((task), i, (type)); \
+                    (ko) && !(l = 0); (ko) = NULL, l = 1)
+
+#define for_each_kobject_current(ko, type) \
+        for_each_kobject(TASK, (ko), (type))
+
 typedef enum {
         KOBJECT_TYPE_INVALID,
@@ -61 +69 @@
 struct task;
 
+void kobject_task_alloc(struct task *);
+void kobject_task_free(struct task *);
+void kobject_task_init(struct task *);
+
 extern void kobject_initialize(kobject_t *);
 extern kobject_t *kobject_get(struct task *, int, kobject_type_t);
@@ -67 +79 @@
 extern void kobject_free(struct task *, int);
 
+extern int kobject_to_cap(struct task *, kobject_t *);
+
 #endif
 

kernel/generic/src/ipc/ipc.c

@@ -735 +735 @@
 {
         call_t *call;
-        size_t i;
+        bool all_clean;
 
 restart:
@@ -742 +742 @@
          * Locking is needed as there may be connection handshakes in progress.
          */
-        for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                phone_t *phone = phone_get_current(i);
-                if (!phone)
-                        continue;
+        all_clean = true;
+        for_each_kobject_current(kobj, KOBJECT_TYPE_PHONE) {
+                phone_t *phone = &kobj->phone;
 
                 mutex_lock(&phone->lock);
@@ -781 +780 @@
                 if (phone->state != IPC_PHONE_FREE) {
                         mutex_unlock(&phone->lock);
+                        all_clean = false;
                         break;
                 }
@@ -788 +788 @@
                 
         /* Got into cleanup */
-        if (i == MAX_KERNEL_OBJECTS)
+        if (all_clean)
                 return;
                 
@@ -820 +820 @@
 
         /* Disconnect all our phones ('ipc_phone_hangup') */
-        for (int i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                phone_t *phone = phone_get_current(i);
-                if (!phone)
-                        continue;
+        for_each_kobject_current(kobj, KOBJECT_TYPE_PHONE) {
+                phone_t *phone = &kobj->phone;
                 ipc_phone_hangup(phone);
         }
@@ -913 +911 @@
         printf("[phone cap] [calls] [state\n");
         
-        size_t i;
-        for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                phone_t *phone = phone_get(task, i);
-                if (!phone)
+        for_each_kobject(task, kobj, KOBJECT_TYPE_PHONE) {
+                phone_t *phone = &kobj->phone;
+                int cap = kobject_to_cap(task, kobj);
+
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
+                        printf("%-11d (mutex busy)\n", cap);
                         continue;
-
-                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
-                        printf("%-10zu (mutex busy)\n", i);
-                        continue;
                 }
                 
                 if (phone->state != IPC_PHONE_FREE) {
-                        printf("%-11zu %7" PRIun " ", i,
+                        printf("%-11d %7" PRIun " ", cap,
                             atomic_get(&phone->active_calls));
                         

kernel/generic/src/kobject/kobject.c

@@ -37 +37 @@
 #include <synch/spinlock.h>
 #include <abi/errno.h>
+#include <mm/slab.h>
 
 void kobject_initialize(kobject_t *kobj)
@@ -42 +43 @@
         kobj->type = KOBJECT_TYPE_INVALID;
         kobj->can_reclaim = NULL;
+}
+
+void kobject_task_alloc(task_t *task)
+{
+        task->kobject = malloc(sizeof(kobject_t) * MAX_KERNEL_OBJECTS, 0);
+}
+
+void kobject_task_init(task_t *task)
+{
+        for (int cap = 0; cap < MAX_KERNEL_OBJECTS; cap++)
+                kobject_initialize(&task->kobject[cap]);
+}
+
+void kobject_task_free(task_t *task)
+{
+        free(task->kobject);
 }
 
@@ -91 +108 @@
 }
 
+int kobject_to_cap(task_t *task, kobject_t *kobj)
+{
+        return kobj - task->kobject;
+}
+
 /** @}
  */

kernel/generic/src/proc/task.c

@@ -168 +168 @@
         
         list_initialize(&task->threads);
-
-        task->kobject = malloc(sizeof(kobject_t) * MAX_KERNEL_OBJECTS, 0);
+        
+        kobject_task_alloc(task);
         
         ipc_answerbox_init(&task->answerbox, task);
@@ -190 +190 @@
         task_t *task = (task_t *) obj;
         
-        free(task->kobject);
+        kobject_task_free(task);
         return 0;
 }
@@ -215 +215 @@
         task->kcycles = 0;
 
-        int cap;
-        for (cap = 0; cap < MAX_KERNEL_OBJECTS; cap++)
-                kobject_initialize(&task->kobject[cap]);
+        kobject_task_init(task);
 
         task->ipc_info.call_sent = 0;
@@ -626 +624 @@
         
         if (*additional) {
-                int i;
-                for (i = 0; i < MAX_KERNEL_OBJECTS; i++) {
-                        phone_t *phone = phone_get(task, i);
-                        if (phone && phone->callee)
-                                printf(" %d:%p", i, phone->callee);
+                for_each_kobject(task, ko, KOBJECT_TYPE_PHONE) {
+                        phone_t *phone = &ko->phone;
+                        if (phone->callee)
+                                printf(" %d:%p", kobject_to_cap(task, ko),
+                                    phone->callee);
                 }
                 printf("\n");