Changeset 0182a665 in mainline

Timestamp:

2006-06-10T13:40:53Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8060a24c

Parents:

971cf31f

Message:

Fix double thread_join() in ktaskgc.
In thread_create(), lock TASK with interrupts disabled again.
thread_join_timeout() can use ordinary waitq_sleep_timeout().

Location:

generic/src/proc

Files:

• task.c (modified) (2 diffs)
• thread.c (modified) (5 diffs)

generic/src/proc/task.c

@@ -301 +301 @@
 
         /*
-         * Interrupt all threads except this one.
+         * Interrupt all threads except ktaskclnp.
          */     
         for (cur = ta->th_head.next; cur != &ta->th_head; cur = cur->next) {
@@ -468 +468 @@
                         thr = list_get_instance(cur, thread_t, th_link);
                         spinlock_lock(&thr->lock);
-                        if (thr->state == Undead && thr->join_type == None) {
+                        if (thr != t && thr->state == Undead && thr->join_type == None) {
                                 thr->join_type = TaskGC;
                                 spinlock_unlock(&thr->lock);

generic/src/proc/thread.c

@@ -351 +351 @@
          * Attach to the containing task.
          */
+        ipl = interrupts_disable();      
         spinlock_lock(&task->lock);
         if (!task->accept_new_threads) {
                 spinlock_unlock(&task->lock);
                 slab_free(thread_slab, t);
+                interrupts_restore(ipl);
                 return NULL;
         }
@@ -365 +367 @@
          * Register this thread in the system-wide list.
          */
-        ipl = interrupts_disable();
         spinlock_lock(&threads_lock);
         btree_insert(&threads_btree, (btree_key_t) ((__address) t), (void *) t, NULL);
@@ -375 +376 @@
 }
 
-/** Make thread exiting
+/** Terminate thread.
  *
  * End current thread execution and switch it to the exiting
@@ -438 +439 @@
         ipl = interrupts_disable();
         spinlock_lock(&t->lock);
-
         ASSERT(!t->detached);
-        
-        (void) waitq_sleep_prepare(&t->join_wq);
         spinlock_unlock(&t->lock);
-        
-        rc = waitq_sleep_timeout_unsafe(&t->join_wq, usec, flags);
-        
-        waitq_sleep_finish(&t->join_wq, rc, ipl);
-        interrupts_restore(ipl);
+        interrupts_restore(ipl);
+        
+        rc = waitq_sleep_timeout(&t->join_wq, usec, flags);
         
         return rc;      
@@ -467 +463 @@
          * pointer to it must be still valid.
          */
-        
         ipl = interrupts_disable();
         spinlock_lock(&t->lock);