Changeset feeac0d in mainline for kernel/generic/src/mm

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (9 diffs)
• backend_anon.c (modified) (1 diff)
• slab.c (modified) (2 diffs)

kernel/generic/src/mm/as.c

@@ -488 +488 @@
         
         /* Eventually check the addresses behind each area */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
                 
                 for (btree_key_t i = 0; i < node->keys; i++) {
@@ -904 +902 @@
                  * reference from all frames found there.
                  */
-                list_foreach(sh_info->pagemap.leaf_list, cur) {
-                        btree_node_t *node
-                            = list_get_instance(cur, btree_node_t, leaf_link);
+                list_foreach(sh_info->pagemap.leaf_list, leaf_link,
+                    btree_node_t, node) {
                         btree_key_t i;
                         
@@ -956 +953 @@
          * Visit only the pages mapped by used_space B+tree.
          */
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         uintptr_t ptr = node->key[i];
@@ -1238 +1234 @@
         size_t used_pages = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -1264 +1259 @@
         size_t frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node = list_get_instance(cur, btree_node_t,
-                    leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -1316 +1310 @@
         frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -2182 +2175 @@
         size_t area_cnt = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 area_cnt += node->keys;
         }
@@ -2195 +2187 @@
         size_t area_idx = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -2231 +2222 @@
         
         /* Print out info about address space areas */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 

kernel/generic/src/mm/backend_anon.c

@@ -118 +118 @@
          */
         mutex_lock(&area->sh_info->lock);
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 unsigned int i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         uintptr_t base = node->key[i];

kernel/generic/src/mm/slab.c

@@ -810 +810 @@
         
         size_t frames = 0;
-        list_foreach(slab_cache_list, cur) {
-                slab_cache_t *cache = list_get_instance(cur, slab_cache_t, link);
+        list_foreach(slab_cache_list, link, slab_cache_t, cache) {
                 frames += _slab_reclaim(cache, flags);
         }
@@ -936 +935 @@
         irq_spinlock_lock(&slab_cache_lock, false);
         
-        list_foreach(slab_cache_list, cur) {
-                slab_cache_t *slab = list_get_instance(cur, slab_cache_t, link);
+        list_foreach(slab_cache_list, link, slab_cache_t, slab) {
                 if ((slab->flags & SLAB_CACHE_MAGDEFERRED) !=
                     SLAB_CACHE_MAGDEFERRED)