Changeset 7f6e755 in mainline

Timestamp:

2006-04-09T15:33:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

602c9101

Parents:

016acbe

Message:

Replace list of all tasks with B+tree of all tasks.

Location:

generic

Files:

• include/proc/task.h (modified) (3 diffs)
• src/proc/task.c (modified) (7 diffs)

generic/include/proc/task.h

@@ -32 +32 @@
 #include <typedefs.h>
 #include <synch/spinlock.h>
+#include <adt/btree.h>
 #include <adt/list.h>
 #include <ipc/ipc.h>
@@ -40 +41 @@
         char *name;
         link_t th_head;         /**< List of threads contained in this task. */
-        link_t tasks_link;      /**< Link to other tasks within the system. */
         as_t *as;               /**< Address space. */
-        task_id_t taskid;           /**< Unique identity of task */
+        task_id_t taskid;       /**< Unique identity of task */
 
         /* IPC stuff */
@@ -51 +51 @@
 
 extern spinlock_t tasks_lock;
-extern link_t tasks_head;
+extern btree_t tasks_btree;
 
 extern void task_init(void);

generic/src/proc/task.c

@@ -36 +36 @@
 #include <arch.h>
 #include <panic.h>
+#include <adt/btree.h>
 #include <adt/list.h>
 #include <ipc/ipc.h>
@@ -43 +44 @@
 
 SPINLOCK_INITIALIZE(tasks_lock);
-LIST_INITIALIZE(tasks_head);
+btree_t tasks_btree;
 static task_id_t task_counter = 0;
 
@@ -54 +55 @@
 {
         TASK = NULL;
+        btree_create(&tasks_btree);
 }
 
@@ -77 +79 @@
         spinlock_initialize(&ta->lock, "task_ta_lock");
         list_initialize(&ta->th_head);
-        list_initialize(&ta->tasks_link);
         ta->as = as;
         ta->name = name;
@@ -93 +94 @@
 
         ta->taskid = ++task_counter;
-        list_append(&ta->tasks_link, &tasks_head);
+        btree_insert(&tasks_btree, (__native) ta, (void *) ta, NULL);
 
         spinlock_unlock(&tasks_lock);
@@ -152 +153 @@
 {
         link_t *cur;
-        task_t *t;
         ipl_t ipl;
-        int i;
         
         /* Messing with thread structures, avoid deadlock */
@@ -160 +159 @@
         spinlock_lock(&tasks_lock);
 
-        for (cur=tasks_head.next; cur!=&tasks_head; cur=cur->next) {
-                t = list_get_instance(cur, task_t, tasks_link);
-                spinlock_lock(&t->lock);
-                printf("%s: address=%P, taskid=%Q, as=%P, ActiveCalls: %d",
-                        t->name, t, t->taskid, t->as, atomic_get(&t->active_calls));
-                for (i=0; i < IPC_MAX_PHONES; i++) {
-                        if (t->phones[i].callee)
-                                printf(" Ph(%d): %P ", i,t->phones[i].callee);
+        for (cur = tasks_btree.leaf_head.next; cur != &tasks_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+                int i;
+                
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+                for (i = 0; i < node->keys; i++) {
+                        task_t *t;
+                        int j;
+
+                        t = (task_t *) node->value[i];
+                
+                        spinlock_lock(&t->lock);
+                        printf("%s: address=%P, taskid=%Q, as=%P, ActiveCalls: %d",
+                                t->name, t, t->taskid, t->as, atomic_get(&t->active_calls));
+                        for (j=0; j < IPC_MAX_PHONES; j++) {
+                                if (t->phones[j].callee)
+                                        printf(" Ph(%d): %P ", j, t->phones[j].callee);
+                        }
+                        printf("\n");
+                        spinlock_unlock(&t->lock);
                 }
-                printf("\n");
-                spinlock_unlock(&t->lock);
         }