Changeset 05ffb41 in mainline for kernel/generic/src/proc/task.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/proc/task.c (modified) (3 diffs)

kernel/generic/src/proc/task.c

@@ -166 +166 @@
         
         list_initialize(&task->threads);
+
+        int cap;
+        for (cap = 0; cap < MAX_KERNEL_OBJECTS; cap++)
+                kobject_init(&task->kobject[cap]);
         
         ipc_answerbox_init(&task->answerbox, task);
         
-        size_t i;
-        for (i = 0; i < IPC_MAX_PHONES; i++)
-                ipc_phone_init(&task->phones[i], task);
-
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
         list_initialize(&task->active_calls);
@@ -228 +228 @@
         
         if ((ipc_phone_0) &&
-            (container_check(ipc_phone_0->task->container, task->container)))
-                (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
+            (container_check(ipc_phone_0->task->container, task->container))) {
+                int cap = phone_alloc(task);
+                assert(cap == 0);
+                (void) ipc_phone_connect(phone_get(task, 0), ipc_phone_0);
+        }
         
         futex_task_init(task);
@@ -611 +614 @@
         
         if (*additional) {
-                size_t i;
-                for (i = 0; i < IPC_MAX_PHONES; i++) {
-                        if (task->phones[i].callee)
-                                printf(" %zu:%p", i, task->phones[i].callee);
+                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);
                 }
                 printf("\n");