Changeset a064d4f in mainline

Timestamp:

2024-01-15T15:39:09Z (4 months ago)

Author:

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

Branches:

master

Children:

0f4f1b2

Parents:

5861b60

Message:

Make thread_join() imply thread_put()

This makes the function more similar to traditional threading APIs.

Location:

kernel/generic/src

Files:

• console/cmd.c (modified) (1 diff)
• ipc/kbox.c (modified) (1 diff)
• main/kinit.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)
• proc/thread.c (modified) (2 diffs)

kernel/generic/src/console/cmd.c

@@ -1006 +1006 @@
                         thread_ready(thread_ref(thread));
                         thread_join(thread);
-                        thread_put(thread);
                 } else
                         printf("Unable to create thread for cpu%u\n", i);

kernel/generic/src/ipc/kbox.c

@@ -90 +90 @@
                 LOG("Join kb.thread.");
                 thread_join(TASK->kb.thread);
-                thread_put(TASK->kb.thread);
                 LOG("...join done.");
                 TASK->kb.thread = NULL;

kernel/generic/src/main/kinit.c

@@ -124 +124 @@
                 thread_ready(thread_ref(thread));
                 thread_join(thread);
-                thread_put(thread);
 
                 /*

kernel/generic/src/proc/scheduler.c

@@ -449 +449 @@
         THREAD->kcycles += get_cycle() - THREAD->last_cycle;
 
+        /*
+         * On Sparc, this saves some extra userspace state that's not
+         * covered by context_save()/context_restore().
+         */
         after_thread_ran_arch();
 

kernel/generic/src/proc/thread.c

@@ -685 +685 @@
 
 /** Wait for another thread to exit.
- * This function does not destroy the thread. Reference counting handles that.
+ * After successful wait, the thread reference is destroyed.
  *
  * @param thread Thread to join on exit.
@@ -703 +703 @@
         irq_spinlock_unlock(&thread->lock, true);
 
-        if (state == Exiting) {
-                return EOK;
-        } else {
-                return _waitq_sleep_timeout(&thread->join_wq, usec, flags);
-        }
+        errno_t rc = EOK;
+
+        if (state != Exiting)
+                rc = _waitq_sleep_timeout(&thread->join_wq, usec, flags);
+
+        if (rc == EOK)
+                thread_put(thread);
+
+        return rc;
 }