Changeset 6454db5e in mainline for kernel/generic/include/mm/as.h

Timestamp:

2018-11-07T17:44:51Z (7 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/include/mm/as.h (modified) (4 diffs)

kernel/generic/include/mm/as.h

@@ -46 +46 @@
 #include <adt/list.h>
 #include <adt/btree.h>
+#include <adt/odict.h>
 #include <lib/elf.h>
 #include <arch.h>
@@ -115 +116 @@
         mutex_t lock;
 
-        /** B+tree of address space areas. */
-        btree_t as_area_btree;
+        /** Address space areas in this address space by base address.
+         *
+         * Members are of type as_area_t.
+         */
+        odict_t as_areas;
 
         /** Non-generic content. */
@@ -204 +208 @@
         as_t *as;
 
+        /** Link to @c as->as_areas */
+        odlink_t las_areas;
+
         /** Memory flags. */
         unsigned int flags;
@@ -273 +280 @@
     uintptr_t *, uintptr_t);
 extern errno_t as_area_change_flags(as_t *, unsigned int, uintptr_t);
+extern as_area_t *as_area_first(as_t *);
+extern as_area_t *as_area_next(as_area_t *);
 
 extern unsigned int as_area_get_flags(as_area_t *);