Changes in kernel/generic/src/proc/task.c [455241b:f35749e] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (8 diffs)

kernel/generic/src/proc/task.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Jakub Jermar
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -104 +104 @@
  *
  */
-void task_done(void)
+void task_done(task_t *cur_task)
 {
         size_t tasks_left;
@@ -112 +112 @@
                 task_t *task_0 = ipc_box_0->task;
                 ipc_box_0 = NULL;
+
                 /*
                  * The first task is held by kinit(), we need to release it or
@@ -129 +130 @@
                 task = task_first();
                 while (task != NULL) {
-                        if (task != TASK) {
+                        if (task != cur_task) {
                                 tasks_left++;
 #ifdef CONFIG_DEBUG
@@ -201 +202 @@
                 return NULL;
 
-        if (caps_task_init(task) != EOK) {
-                slab_free(task_cache, task);
-                return NULL;
-        }
-
         refcount_init(&task->refcount);
 
@@ -217 +213 @@
         task->ucycles = 0;
         task->kcycles = 0;
+
+        caps_task_init(task);
 
         task->ipc_info.call_sent = 0;
@@ -251 +249 @@
                 }
 
-                phone_t *phone = phone_from_kobject(
-                    kobject_get(task, phone_handle, KOBJECT_TYPE_PHONE));
-                (void) ipc_phone_connect(phone, ipc_box_0);
+                kobject_t *phone_obj = kobject_get(task, phone_handle,
+                    KOBJECT_TYPE_PHONE);
+                (void) ipc_phone_connect(phone_obj->phone, ipc_box_0);
         }
 
@@ -290 +288 @@
          */
         as_release(task->as);
-
-        caps_task_clear(task);
 
         slab_free(task_cache, task);