Changeset fb13b44 in mainline for kernel/generic/src

Timestamp:

2019-08-06T19:57:27Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

103939e

Parents:

d89b259

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-08-10 08:35:21)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 19:57:27)

Message:

Spawned tasks' phone is connected to spawning task

• Only boot time tasks are connected to hardcoded NS task.
• First connected phone of other tasks is connected to the task that spawned them (spawn parent).
• Until further changes, effectively it changes nothing (NS was the ultimate spawn parent).

Conflicts:

kernel/generic/include/proc/program.h
kernel/generic/src/ipc/ipc.c
kernel/generic/src/proc/program.c
kernel/generic/src/proc/task.c

Location:

kernel/generic/src

Files:

• ipc/ipc.c (modified) (1 diff)
• main/main.c (modified) (1 diff)
• proc/program.c (modified) (5 diffs)
• proc/task.c (modified) (3 diffs)

kernel/generic/src/ipc/ipc.c

@@ -65 +65 @@
 static void ipc_forget_call(call_t *);
 
-/** Answerbox that new tasks are automatically connected to */
+/** Answerbox that is assigned to boot-time tasks */
 answerbox_t *ipc_box_0 = NULL;
 

kernel/generic/src/main/main.c

@@ -298 +298 @@
          * Create kernel task.
          */
-        task_t *kernel = task_create(AS_KERNEL, "kernel");
+        task_t *kernel = task_create(AS_KERNEL, "kernel", NULL);
         if (!kernel)
                 panic("Cannot create kernel task.");

kernel/generic/src/proc/program.c

@@ -64 +64 @@
  * @param entry_addr Program entry-point address in program address space.
  * @param name       Name to set for the program's task.
+ * @param answerbox  Answerbox where box 0 is connected to (may be NULL).
  * @param prg        Buffer for storing program information.
  *
@@ -69 +70 @@
  *
  */
-errno_t program_create(as_t *as, uspace_addr_t entry_addr, char *name, program_t *prg)
+errno_t program_create(as_t *as, uspace_addr_t entry_addr, char *name,
+        struct answerbox *answerbox, program_t *prg)
 {
         uspace_arg_t *kernel_uarg = (uspace_arg_t *)
@@ -77 +79 @@
 
         prg->loader_status = EOK;
-        prg->task = task_create(as, name);
+        prg->task = task_create(as, name, answerbox);
         if (!prg->task) {
                 free(kernel_uarg);
@@ -157 +159 @@
 
         return program_create(as, ((elf_header_t *) image_addr)->e_entry,
-            name, prg);
+            name, ipc_box_0, prg);
 }
 
@@ -191 +193 @@
 
         return program_create(as, ((elf_header_t *) program_loader)->e_entry,
-            name, prg);
+            name, &TASK->answerbox, prg);
 }
 

kernel/generic/src/proc/task.c

@@ -190 +190 @@
 /** Create new task with no threads.
  *
- * @param as   Task's address space.
- * @param name Symbolic name (a copy is made).
+ * @param as         Task's address space.
+ * @param name       Symbolic name (a copy is made).
+ * @param answerbox  (Optional) answerbox where box 0 is connected to.
  *
  * @return New task's structure.
  *
  */
-task_t *task_create(as_t *as, const char *name)
+task_t *task_create(as_t *as, const char *name, answerbox_t *answerbox)
 {
         task_t *task = (task_t *) slab_alloc(task_cache, FRAME_ATOMIC);
@@ -234 +235 @@
 #endif
 
-        if ((ipc_box_0) &&
-            (container_check(ipc_box_0->task->container, task->container))) {
+        if ((answerbox) &&
+            (container_check(answerbox->task->container, task->container))) {
                 cap_phone_handle_t phone_handle;
                 errno_t rc = phone_alloc(task, true, &phone_handle, NULL);
@@ -247 +248 @@
                 kobject_t *phone_obj = kobject_get(task, phone_handle,
                     KOBJECT_TYPE_PHONE);
-                (void) ipc_phone_connect(phone_obj->phone, ipc_box_0);
+                (void) ipc_phone_connect(phone_obj->phone, answerbox);
         }