Changeset bd08239 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2011-06-18T15:35:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (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/mm/as.c (modified) (15 diffs)

kernel/generic/src/mm/as.c

@@ -94 +94 @@
  *
  * This lock protects:
- * - inactive_as_with_asid_head list
+ * - inactive_as_with_asid_list
  * - as->asid for each as of the as_t type
  * - asids_allocated counter
@@ -105 +105 @@
  * that have valid ASID.
  */
-LIST_INITIALIZE(inactive_as_with_asid_head);
+LIST_INITIALIZE(inactive_as_with_asid_list);
 
 /** Kernel address space. */
@@ -235 +235 @@
         bool cond = true;
         while (cond) {
-                ASSERT(!list_empty(&as->as_area_btree.leaf_head));
+                ASSERT(!list_empty(&as->as_area_btree.leaf_list));
                 
                 btree_node_t *node =
-                    list_get_instance(as->as_area_btree.leaf_head.next,
+                    list_get_instance(list_first(&as->as_area_btree.leaf_list),
                     btree_node_t, leaf_link);
                 
@@ -602 +602 @@
                 bool cond = true;
                 while (cond) {
-                        ASSERT(!list_empty(&area->used_space.leaf_head));
+                        ASSERT(!list_empty(&area->used_space.leaf_list));
                         
                         btree_node_t *node =
-                            list_get_instance(area->used_space.leaf_head.prev,
+                            list_get_instance(list_last(&area->used_space.leaf_list),
                             btree_node_t, leaf_link);
                         
@@ -727 +727 @@
         if (--sh_info->refcount == 0) {
                 dealloc = true;
-                link_t *cur;
                 
                 /*
@@ -733 +732 @@
                  * reference from all frames found there.
                  */
-                for (cur = sh_info->pagemap.leaf_head.next;
-                    cur != &sh_info->pagemap.leaf_head; cur = cur->next) {
+                list_foreach(sh_info->pagemap.leaf_list, cur) {
                         btree_node_t *node
                             = list_get_instance(cur, btree_node_t, leaf_link);
@@ -786 +784 @@
          * Visit only the pages mapped by used_space B+tree.
          */
-        link_t *cur;
-        for (cur = area->used_space.leaf_head.next;
-            cur != &area->used_space.leaf_head; cur = cur->next) {
+        list_foreach(area->used_space.leaf_list, cur) {
                 btree_node_t *node;
                 btree_key_t i;
@@ -1065 +1061 @@
          */
         size_t used_pages = 0;
-        link_t *cur;
-        
-        for (cur = area->used_space.leaf_head.next;
-            cur != &area->used_space.leaf_head; cur = cur->next) {
+        
+        list_foreach(area->used_space.leaf_list, cur) {
                 btree_node_t *node
                     = list_get_instance(cur, btree_node_t, leaf_link);
@@ -1094 +1088 @@
         size_t frame_idx = 0;
         
-        for (cur = area->used_space.leaf_head.next;
-            cur != &area->used_space.leaf_head; cur = cur->next) {
+        list_foreach(area->used_space.leaf_list, cur) {
                 btree_node_t *node = list_get_instance(cur, btree_node_t,
                     leaf_link);
@@ -1147 +1140 @@
         frame_idx = 0;
         
-        for (cur = area->used_space.leaf_head.next;
-            cur != &area->used_space.leaf_head; cur = cur->next) {
+        list_foreach(area->used_space.leaf_list, cur) {
                 btree_node_t *node
                     = list_get_instance(cur, btree_node_t, leaf_link);
@@ -1334 +1326 @@
                         
                         list_append(&old_as->inactive_as_with_asid_link,
-                            &inactive_as_with_asid_head);
+                            &inactive_as_with_asid_list);
                 }
                 
@@ -2027 +2019 @@
         
         /* Eventually check the addresses behind each area */
-        link_t *cur;
-        for (cur = AS->as_area_btree.leaf_head.next;
-            (ret == 0) && (cur != &AS->as_area_btree.leaf_head);
-            cur = cur->next) {
+        list_foreach(AS->as_area_btree.leaf_list, cur) {
+                if (ret != 0)
+                        break;
+
                 btree_node_t *node =
                     list_get_instance(cur, btree_node_t, leaf_link);
@@ -2072 +2064 @@
         
         size_t area_cnt = 0;
-        link_t *cur;
-        
-        for (cur = as->as_area_btree.leaf_head.next;
-            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+        
+        list_foreach(as->as_area_btree.leaf_list, cur) {
                 btree_node_t *node =
                     list_get_instance(cur, btree_node_t, leaf_link);
@@ -2088 +2078 @@
         size_t area_idx = 0;
         
-        for (cur = as->as_area_btree.leaf_head.next;
-            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
                 btree_node_t *node =
                     list_get_instance(cur, btree_node_t, leaf_link);
@@ -2125 +2114 @@
         
         /* Print out info about address space areas */
-        link_t *cur;
-        for (cur = as->as_area_btree.leaf_head.next;
-            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
                 btree_node_t *node
                     = list_get_instance(cur, btree_node_t, leaf_link);