Changeset 48d14222 in mainline

Timestamp:

2007-06-04T19:50:44Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

473e693

Parents:

cb4afd8b

Message:

JoinMe → Lingering

Location:

kernel/generic

Files:

• include/proc/thread.h (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (4 diffs)

kernel/generic/include/proc/thread.h

@@ -82 +82 @@
         /** After a thread calls thread_exit(), it is put into Exiting state. */
         Exiting,
-        /** Threads that were not detached but exited are in the JoinMe state. */
-        JoinMe
+        /** Threads that were not detached but exited are Lingering. */
+        Lingering
 } state_t;
 

kernel/generic/src/proc/scheduler.c

@@ -416 +416 @@
                                 spinlock_unlock(&THREAD->join_wq.lock);
                                 
-                                THREAD->state = JoinMe;
+                                THREAD->state = Lingering;
                                 spinlock_unlock(&THREAD->lock);
                         }

kernel/generic/src/proc/thread.c

@@ -79 +79 @@
         "Entering",
         "Exiting",
-        "JoinMe"
+        "Lingering"
 }; 
 
@@ -357 +357 @@
 void thread_destroy(thread_t *t)
 {
-        ASSERT(t->state == Exiting || t->state == JoinMe);
+        ASSERT(t->state == Exiting || t->state == Lingering);
         ASSERT(t->task);
         ASSERT(t->cpu);
@@ -521 +521 @@
 /** Detach thread.
  *
- * Mark the thread as detached, if the thread is already in the JoinMe state,
- * deallocate its resources.
+ * Mark the thread as detached, if the thread is already in the Lingering
+ * state, deallocate its resources.
  *
  * @param t Thread to be detached.
@@ -537 +537 @@
         spinlock_lock(&t->lock);
         ASSERT(!t->detached);
-        if (t->state == JoinMe) {
+        if (t->state == Lingering) {
                 thread_destroy(t);      /* unlocks &t->lock */
                 interrupts_restore(ipl);