Changeset 6454db5e in mainline for kernel/generic/src/sysinfo/stats.c

Timestamp:

2018-11-07T17:44:51Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

b294126

Parents:

4a8d0dd1 (diff), 6785b88b (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.

git-author:

jxsvoboda <5887334+jxsvoboda@…> (2018-11-07 17:44:51)

git-committer:

GitHub <noreply@…> (2018-11-07 17:44:51)

Message:

Merge pull request #51 from jxsvoboda/master

Replace as_area_btree with ordered dictionary.

File:

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

kernel/generic/src/sysinfo/stats.c

@@ -145 +145 @@
         size_t pages = 0;
 
-        /* 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);
-                }
+        /* 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);
         }
 
@@ -186 +182 @@
         size_t pages = 0;
 
-        /* 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);
-                }
+        /* 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);
         }