Changes in kernel/generic/src/sysinfo/stats.c [88cc71c0:aab5e46] in mainline

File:

• kernel/generic/src/sysinfo/stats.c (modified) (2 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -145 +145 @@
         size_t pages = 0;
 
-        /* Walk areas in the address space and count pages */
-        as_area_t *area = as_area_first(as);
-        while (area != NULL) {
-                if (mutex_trylock(&area->lock) != EOK)
-                        continue;
-
-                pages += area->pages;
-                mutex_unlock(&area->lock);
-                area = as_area_next(area);
+        /* Walk the B+ tree and count pages */
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
+                unsigned int i;
+                for (i = 0; i < node->keys; i++) {
+                        as_area_t *area = node->value[i];
+
+                        if (mutex_trylock(&area->lock) != EOK)
+                                continue;
+
+                        pages += area->pages;
+                        mutex_unlock(&area->lock);
+                }
         }
 
@@ -182 +186 @@
         size_t pages = 0;
 
-        /* Walk areas in the address space and count pages */
-        as_area_t *area = as_area_first(as);
-        while (area != NULL) {
-                if (mutex_trylock(&area->lock) != EOK)
-                        continue;
-
-                pages += area->resident;
-                mutex_unlock(&area->lock);
-                area = as_area_next(area);
+        /* Walk the B+ tree and count pages */
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
+                unsigned int i;
+                for (i = 0; i < node->keys; i++) {
+                        as_area_t *area = node->value[i];
+
+                        if (mutex_trylock(&area->lock) != EOK)
+                                continue;
+
+                        pages += area->resident;
+                        mutex_unlock(&area->lock);
+                }
         }