Changeset b50b5af2 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/proc/task.c (modified) (8 diffs)

kernel/generic/src/proc/task.c

@@ -75 +75 @@
 static task_id_t task_counter = 0;
 
+/* Forward declarations. */
+static void task_kill_internal(task_t *);
+
 /** Initialize kernel tasks support. */
 void task_init(void)
@@ -83 +86 @@
 
 /*
- * The idea behind this walker is to remember a single task different from
+ * The idea behind this walker is to kill and count all tasks different from
  * TASK.
  */
@@ -89 +92 @@
 {
         task_t *t = avltree_get_instance(node, task_t, tasks_tree_node);
-        task_t **tp = (task_t **) arg;
-
-        if (t != TASK) { 
-                *tp = t;
-                return false;   /* stop walking */
+        unsigned *cnt = (unsigned *) arg;
+
+        if (t != TASK) {
+                (*cnt)++;
+#ifdef CONFIG_DEBUG
+                printf("[%"PRIu64"] ", t->taskid);
+#endif
+                task_kill_internal(t);
         }
 
@@ -102 +108 @@
 void task_done(void)
 {
-        task_t *t;
+        unsigned tasks_left;
+
         do { /* Repeat until there are any tasks except TASK */
-                
                 /* Messing with task structures, avoid deadlock */
+#ifdef CONFIG_DEBUG
+                printf("Killing tasks... ");
+#endif
                 ipl_t ipl = interrupts_disable();
                 spinlock_lock(&tasks_lock);
-                
-                t = NULL;
-                avltree_walk(&tasks_tree, task_done_walker, &t);
-                
-                if (t != NULL) {
-                        task_id_t id = t->taskid;
-                        
-                        spinlock_unlock(&tasks_lock);
-                        interrupts_restore(ipl);
-                        
+                tasks_left = 0;
+                avltree_walk(&tasks_tree, task_done_walker, &tasks_left);
+                spinlock_unlock(&tasks_lock);
+                interrupts_restore(ipl);
+                thread_sleep(1);
 #ifdef CONFIG_DEBUG
-                        printf("Killing task %" PRIu64 "\n", id);
-#endif                  
-                        task_kill(id);
-                        thread_usleep(10000);
-                } else {
-                        spinlock_unlock(&tasks_lock);
-                        interrupts_restore(ipl);
-                }
-                
-        } while (t != NULL);
+                printf("\n");
+#endif
+        } while (tasks_left);
 }
 
@@ -200 +197 @@
         interrupts_restore(ipl);
         
-        /*
-         * Notify about task creation.
-         */
-        if (event_is_subscribed(EVENT_WAIT))
-                event_notify_3(EVENT_WAIT, TASK_CREATE, LOWER32(ta->taskid),
-                    UPPER32(ta->taskid));
-        
         return ta;
 }
@@ -238 +228 @@
         if (atomic_predec(&t->as->refcount) == 0) 
                 as_destroy(t->as);
-        
-        /*
-         * Notify about task destruction.
-         */
-        if (event_is_subscribed(EVENT_WAIT))
-                event_notify_3(EVENT_WAIT, TASK_DESTROY, LOWER32(t->taskid),
-                    UPPER32(t->taskid));
         
         free(t);
@@ -350 +333 @@
 }
 
-/** Kill task.
- *
- * This function is idempotent.
- * It signals all the task's threads to bail it out.
- *
- * @param id            ID of the task to be killed.
- *
- * @return              Zero on success or an error code from errno.h.
- */
-int task_kill(task_id_t id)
-{
-        ipl_t ipl;
-        task_t *ta;
+static void task_kill_internal(task_t *ta)
+{
         link_t *cur;
 
-        if (id == 1)
-                return EPERM;
-        
-        ipl = interrupts_disable();
-        spinlock_lock(&tasks_lock);
-        if (!(ta = task_find_by_id(id))) {
-                spinlock_unlock(&tasks_lock);
-                interrupts_restore(ipl);
-                return ENOENT;
-        }
-        spinlock_unlock(&tasks_lock);
-        
         /*
          * Interrupt all threads.
@@ -397 +357 @@
         }
         spinlock_unlock(&ta->lock);
+}
+
+/** Kill task.
+ *
+ * This function is idempotent.
+ * It signals all the task's threads to bail it out.
+ *
+ * @param id            ID of the task to be killed.
+ *
+ * @return              Zero on success or an error code from errno.h.
+ */
+int task_kill(task_id_t id)
+{
+        ipl_t ipl;
+        task_t *ta;
+
+        if (id == 1)
+                return EPERM;
+        
+        ipl = interrupts_disable();
+        spinlock_lock(&tasks_lock);
+        if (!(ta = task_find_by_id(id))) {
+                spinlock_unlock(&tasks_lock);
+                interrupts_restore(ipl);
+                return ENOENT;
+        }
+        task_kill_internal(ta);
+        spinlock_unlock(&tasks_lock);
         interrupts_restore(ipl);
-        
         return 0;
 }