Changeset 7509ddc in mainline for generic/src/proc/thread.c

Timestamp:

2006-06-04T21:54:49Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34dcd3f

Parents:

2cb5e64

Message:

Framework for task_kill().
Some pieces (e.g. implementation of ktask_cleanup() kernel thread and
task_destroy() function) are missing.
Changed locking order for task lock, threads_lock and thread lock from
threads_lock, thread lock, task lock to task lock, threads_lock, thread lock.

File:

• generic/src/proc/thread.c (modified) (6 diffs)

generic/src/proc/thread.c

@@ -234 +234 @@
 void thread_destroy(thread_t *t)
 {
+        bool destroy_task = false;      
+
         ASSERT(t->state == Exiting);
         ASSERT(t->task);
@@ -242 +244 @@
                 t->cpu->fpu_owner=NULL;
         spinlock_unlock(&t->cpu->lock);
+
+        spinlock_unlock(&t->lock);
+
+        spinlock_lock(&threads_lock);
+        btree_remove(&threads_btree, (btree_key_t) ((__address ) t), NULL);
+        spinlock_unlock(&threads_lock);
 
         /*
@@ -248 +256 @@
         spinlock_lock(&t->task->lock);
         list_remove(&t->th_link);
-        spinlock_unlock(&t->task->lock);
-        
-        spinlock_unlock(&t->lock);
-        
-        spinlock_lock(&threads_lock);
-        btree_remove(&threads_btree, (btree_key_t) ((__address ) t), NULL);
-        spinlock_unlock(&threads_lock);
+        if (--t->task->refcount == 0) {
+                t->task->accept_new_threads = false;
+                destroy_task = true;
+        }
+        spinlock_unlock(&t->task->lock);        
+        
+        if (destroy_task)
+                task_destroy(t->task);
         
         slab_free(thread_slab, t);
@@ -320 +329 @@
         t->in_copy_from_uspace = false;
         t->in_copy_to_uspace = false;
-        
+
+        t->interrupted = false; 
         t->detached = false;
         waitq_initialize(&t->join_wq);
@@ -330 +340 @@
         t->fpu_context_exists = 0;
         t->fpu_context_engaged = 0;
-        
-        /*
-         * 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);
-        spinlock_unlock(&threads_lock);
         
         /*
@@ -343 +345 @@
          */
         spinlock_lock(&task->lock);
+        if (!task->accept_new_threads) {
+                spinlock_unlock(&task->lock);
+                slab_free(thread_slab, t);
+                return NULL;
+        }
         list_append(&t->th_link, &task->th_head);
+        task->refcount++;
         spinlock_unlock(&task->lock);
+
+        /*
+         * 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);
+        spinlock_unlock(&threads_lock);
         
         interrupts_restore(ipl);