Changeset 34dcd3f in mainline

Timestamp:

2006-06-05T07:47:45Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c778c1a

Parents:

7509ddc

Message:

Update for task_kill().

Location:

generic/src

Files:

• proc/task.c (modified) (4 diffs)
• synch/waitq.c (modified) (2 diffs)

generic/src/proc/task.c

@@ -59 +59 @@
 static task_id_t task_counter = 0;
 
-static void ktask_cleanup(void *);
+static void ktaskclnp(void *);
 
 /** Initialize tasks
@@ -248 +248 @@
         spinlock_unlock(&ta->lock);
         
-        t = thread_create(ktask_cleanup, NULL, ta, 0, "ktask_cleanup");
+        t = thread_create(ktaskclnp, NULL, ta, 0, "ktaskclnp");
         
         spinlock_lock(&ta->lock);
+        ta->accept_new_threads = false;
         ta->refcount--;
         
@@ -271 +272 @@
         }
         
-        thread_ready(t);
-        
+        spinlock_unlock(&ta->lock);
+        interrupts_restore(ipl);
+        
+        if (t)
+                thread_ready(t);
+
         return 0;
 }
@@ -314 +319 @@
 
 /** Kernel thread used to cleanup the task. */
-void ktask_cleanup(void *arg)
-{
+void ktaskclnp(void *arg)
+{
+        ipl_t ipl;
+        thread_t *t = NULL;
+        link_t *cur;
+
+        thread_detach(THREAD);
+
+loop:
+        ipl = interrupts_disable();
+        spinlock_lock(&TASK->lock);
+        
+        /*
+         * Find a thread to join.
+         */
+        for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
+                t = list_get_instance(cur, thread_t, th_link);
+                if (t == THREAD)
+                        continue;
+                else
+                        break;
+        }
+        
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
+        
+        if (t != THREAD) {
+                thread_join(t);
+                thread_detach(t);
+                goto loop;
+        }
+        
+        /*
+         * Now there are no other threads in this task
+         * and no new threads can be created.
+         */
+        
         /*
          * TODO:
-         * Wait until it is save to cleanup the task (i.e. all other threads exit)
-         * and do the cleanup (e.g. close IPC communication and release used futexes).
+         * Close IPC communication and release used futexes.
          * When this thread exits, the task refcount drops to zero and the task structure is
          * cleaned.

generic/src/synch/waitq.c

@@ -312 +312 @@
         spinlock_lock(&THREAD->lock);
 
-        if (THREAD->interrupted) {
-                spinlock_unlock(&THREAD->lock);
-                spinlock_unlock(&wq->lock);
-                return ESYNCH_INTERRUPTED;
-        }
-
         if (flags & SYNCH_FLAGS_INTERRUPTIBLE) {
+
+                /*
+                 * If the thread was already interrupted,
+                 * don't go to sleep at all.
+                 */
+                if (THREAD->interrupted) {
+                        spinlock_unlock(&THREAD->lock);
+                        spinlock_unlock(&wq->lock);
+                        return ESYNCH_INTERRUPTED;
+                }
+
                 /*
                  * Set context that will be restored if the sleep
@@ -329 +334 @@
                         return ESYNCH_INTERRUPTED;
                 }
+
         } else {
                 THREAD->sleep_interruptible = false;