Changeset f35749e in mainline for kernel/generic/src/proc

Timestamp:

2025-02-28T23:38:26Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

8300c72

Parents:

4285f384

Message:

System restart via shutdown -r

Location:

kernel/generic/src/proc

Files:

• task.c (modified) (4 diffs)
• thread.c (modified) (2 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

kernel/generic/src/proc/thread.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Jakub Jermar
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -338 +338 @@
         irq_spinlock_unlock(&thread->task->lock, false);
 
-        assert((atomic_get_unordered(&thread->state) == Exiting) || (atomic_get_unordered(&thread->state) == Lingering));
+        assert((atomic_get_unordered(&thread->state) == Entering) ||
+            (atomic_get_unordered(&thread->state) == Exiting) ||
+            (atomic_get_unordered(&thread->state) == Lingering));
 
         /* Clear cpu->fpu_owner if set to this thread. */