Changeset fe19611 in mainline for generic/src/proc/scheduler.c

Timestamp:

2006-06-04T17:15:27Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c4e4507

Parents:

8adafa0

Message:

thread_join_timeout() and thread_detach() implementation.
Needs more thorough testing.

File:

• generic/src/proc/scheduler.c (modified) (2 diffs)

generic/src/proc/scheduler.c

@@ -41 +41 @@
 #include <mm/page.h>
 #include <mm/as.h>
+#include <time/delay.h>
 #include <arch/asm.h>
 #include <arch/faddr.h>
@@ -375 +376 @@
 
                     case Exiting:
-                        thread_destroy(THREAD);
+repeat:
+                        if (THREAD->detached) {
+                                thread_destroy(THREAD);
+                        } else {
+                                /*
+                                 * The thread structure is kept allocated until somebody
+                                 * calls thread_detach() on it.
+                                 */
+                                if (!spinlock_trylock(&THREAD->join_wq.lock)) {
+                                        /*
+                                         * Avoid deadlock.
+                                         */
+                                        spinlock_unlock(&THREAD->lock);
+                                        delay(10);
+                                        spinlock_lock(&THREAD->lock);
+                                        goto repeat;
+                                }
+                                _waitq_wakeup_unsafe(&THREAD->join_wq, false);
+                                spinlock_unlock(&THREAD->join_wq.lock);
+                                
+                                THREAD->state = Undead;
+                                spinlock_unlock(&THREAD->lock);
+                        }
                         break;