Changeset 0f4f1b2 in mainline for kernel/generic/src

Timestamp:

2024-01-15T17:10:27Z (18 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

e82879c

Parents:

a064d4f

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-15 16:37:22)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-15 17:10:27)

Message:

Add (and use) functions thread_start() and thread_detach()

Mostly cosmetic, with thread_start() replacing calls to thread_ready(),
but not consuming the passed reference, and thread_detach() being
synonym for thread_put(). Makes the code's function more obvious.

Also modify some threaded tests to use thread_join() for waiting,
instead of counting threads with atomics or semaphores.

Location:

kernel/generic/src

Files:

• console/cmd.c (modified) (1 diff)
• ipc/kbox.c (modified) (1 diff)
• main/kinit.c (modified) (4 diffs)
• main/main.c (modified) (1 diff)
• proc/program.c (modified) (1 diff)
• proc/thread.c (modified) (3 diffs)

kernel/generic/src/console/cmd.c

@@ -1004 +1004 @@
                         printf("cpu%u: ", i);
                         thread_wire(thread, &cpus[i]);
-                        thread_ready(thread_ref(thread));
+                        thread_start(thread);
                         thread_join(thread);
                 } else

kernel/generic/src/ipc/kbox.c

@@ -246 +246 @@
                 }
 
-                task->kb.thread = thread_ref(kb_thread);
-                thread_ready(kb_thread);
+                task->kb.thread = kb_thread;
+                thread_start(kb_thread);
         }
 

kernel/generic/src/main/kinit.c

@@ -122 +122 @@
 
                 thread_wire(thread, &cpus[0]);
-                thread_ready(thread_ref(thread));
+                thread_start(thread);
                 thread_join(thread);
 
@@ -135 +135 @@
                         if (thread != NULL) {
                                 thread_wire(thread, &cpus[i]);
-                                thread_ready(thread);
+                                thread_start(thread);
+                                thread_detach(thread);
                         } else
                                 log(LF_OTHER, LVL_ERROR,
@@ -151 +152 @@
         thread = thread_create(kload, NULL, TASK, THREAD_FLAG_NONE,
             "kload");
-        if (thread != NULL)
-                thread_ready(thread);
-        else
+        if (thread != NULL) {
+                thread_start(thread);
+                thread_detach(thread);
+        } else {
                 log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
+        }
 
 #ifdef CONFIG_KCONSOLE
@@ -163 +166 @@
                 thread = thread_create(kconsole_thread, NULL, TASK,
                     THREAD_FLAG_NONE, "kconsole");
-                if (thread != NULL)
-                        thread_ready(thread);
-                else
+                if (thread != NULL) {
+                        thread_start(thread);
+                        thread_detach(thread);
+                } else {
                         log(LF_OTHER, LVL_ERROR,
                             "Unable to create kconsole thread");
+                }
         }
 #endif /* CONFIG_KCONSOLE */

kernel/generic/src/main/main.c

@@ -282 +282 @@
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");
-        thread_ready(kinit_thread);
+        thread_start(kinit_thread);
+        thread_detach(kinit_thread);
 
         /*

kernel/generic/src/proc/program.c

@@ -212 +212 @@
 void program_ready(program_t *prg)
 {
-        thread_ready(prg->main_thread);
+        thread_start(prg->main_thread);
+        thread_detach(prg->main_thread);
         prg->main_thread = NULL;
 }

kernel/generic/src/proc/thread.c

@@ -234 +234 @@
 }
 
+/** Start a thread that wasn't started yet since it was created.
+ *
+ * @param thread A reference to the newly created thread.
+ */
+void thread_start(thread_t *thread)
+{
+        assert(thread->state == Entering);
+        thread_ready(thread_ref(thread));
+}
+
 /** Make thread ready
  *
@@ -696 +706 @@
 errno_t thread_join_timeout(thread_t *thread, uint32_t usec, unsigned int flags)
 {
+        assert(thread != NULL);
+
         if (thread == THREAD)
                 return EINVAL;
@@ -712 +724 @@
 
         return rc;
+}
+
+void thread_detach(thread_t *thread)
+{
+        thread_put(thread);
 }