Changeset 31e8ddd in mainline

Timestamp:

2006-06-05T17:25:37Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2569ec90

Parents:

9c1c677

Message:

task_destroy() implementation, fixes in as_destroy() and task_kill().
This is the first version of HelenOS that would perform complete cleanup leading from thread to destruction of address space.

Files:

• arch/amd64/src/proc/task.c (modified) (2 diffs)
• arch/ia32/src/proc/task.c (modified) (2 diffs)
• arch/ia64/include/proc/task.h (modified) (1 diff)
• arch/mips32/include/proc/task.h (modified) (1 diff)
• arch/ppc32/include/proc/task.h (modified) (1 diff)
• arch/ppc64/include/proc/task.h (modified) (1 diff)
• arch/sparc64/include/proc/task.h (modified) (1 diff)
• generic/include/proc/task.h (modified) (1 diff)
• generic/src/mm/as.c (modified) (1 diff)
• generic/src/proc/task.c (modified) (2 diffs)

arch/amd64/src/proc/task.c

@@ -28 +28 @@
 
 #include <proc/task.h>
+#include <mm/slab.h>
 #include <arch/types.h>
 
@@ -39 +40 @@
         bitmap_initialize(&t->arch.iomap, NULL, 0);
 }
+
+/** Perform amd64 specific task destruction.
+ *
+ * @param t Task to be initialized.
+ */
+void task_destroy_arch(task_t *t)
+{
+        if (t->arch.iomap.map)
+                free(t->arch.iomap.map);
+}

arch/ia32/src/proc/task.c

@@ -30 +30 @@
 #include <arch/types.h>
 #include <adt/bitmap.h>
+#include <mm/slab.h>
 
 /** Perform ia32 specific task initialization.
@@ -40 +41 @@
         bitmap_initialize(&t->arch.iomap, NULL, 0);
 }
+
+/** Perform ia32 specific task destruction.
+ *
+ * @param t Task to be initialized.
+ */
+void task_destroy_arch(task_t *t)
+{
+        if (t->arch.iomap.map)
+                free(t->arch.iomap.map);
+}

arch/ia64/include/proc/task.h

@@ -34 +34 @@
 
 #define task_create_arch(t)
+#define task_destroy_arch(t)
 
 #endif

arch/mips32/include/proc/task.h

@@ -34 +34 @@
 
 #define task_create_arch(t)
+#define task_destroy_arch(t)
 
 #endif

arch/ppc32/include/proc/task.h

@@ -34 +34 @@
 
 #define task_create_arch(t)
+#define task_destroy_arch(t)
 
 #endif

arch/ppc64/include/proc/task.h

@@ -34 +34 @@
 
 #define task_create_arch(t)
+#define task_destroy_arch(t)
 
 #endif

arch/sparc64/include/proc/task.h

@@ -34 +34 @@
 
 #define task_create_arch(t)
+#define task_destroy_arch(t)
 
 #endif

generic/include/proc/task.h

@@ -93 +93 @@
 #endif
 
+#ifndef task_destroy_arch
+extern void task_destroy_arch(task_t *t);
+#endif
+
 extern __native sys_task_get_id(task_id_t *uspace_task_id);
 

generic/src/mm/as.c

@@ -148 +148 @@
         ipl = interrupts_disable();
         spinlock_lock(&inactive_as_with_asid_lock);
-        if (as->asid != ASID_INVALID && as->asid != ASID_KERNEL) {
-                list_remove(&as->inactive_as_with_asid_link);
+
+        if (as->asid != ASID_INVALID && as != AS_KERNEL) {
+                if (!as->cpu_refcount)
+                        list_remove(&as->inactive_as_with_asid_link);
                 asid_put(as->asid);
         }

generic/src/proc/task.c

@@ -141 +141 @@
 void task_destroy(task_t *t)
 {
+        spinlock_lock(&tasks_lock);
+        btree_remove(&tasks_btree, t->taskid, NULL);
+        spinlock_unlock(&tasks_lock);
+
+        task_destroy_arch(t);
+        btree_destroy(&t->futexes);
+
+        mutex_lock_active(&t->as->lock);
+        if (--t->as->refcount == 0) {
+                mutex_unlock(&t->as->lock);
+                as_destroy(t->as);
+                /*
+                 * t->as is destroyed.
+                 */
+        } else {
+                mutex_unlock(&t->as->lock);
+        }
+        
+        free(t);
+        TASK = NULL;
 }
 
@@ -259 +279 @@
         ta->refcount++;
         spinlock_unlock(&ta->lock);
+
+        spinlock_unlock(&tasks_lock);
         
         t = thread_create(ktaskclnp, NULL, ta, 0, "ktaskclnp");