Changeset de0af3a in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2018-12-03T18:29:53Z (5 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

0777a933, 7be8d4d

Parents:

a0765f6

git-author:

Jiri Svoboda <jiri@…> (2018-12-03 16:53:27)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2018-12-03 18:29:53)

Message:

Use ordered dictionary for pagemap instead of B+tree

At the same time we add a little bit more abstraction around the pagemap.

File:

• kernel/generic/src/mm/backend_elf.c (modified) (4 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -219 +219 @@
                                 assert(PTE_PRESENT(&pte));
 
-                                btree_insert(&area->sh_info->pagemap,
+                                as_pagemap_insert(&area->sh_info->pagemap,
                                     (base + P2SZ(j)) - area->base,
-                                    (void *) PTE_GET_FRAME(&pte), NULL);
+                                    PTE_GET_FRAME(&pte));
                                 page_table_unlock(area->as, false);
 
@@ -267 +267 @@
         elf_header_t *elf = area->backend_data.elf;
         elf_segment_header_t *entry = area->backend_data.segment;
-        btree_node_t *leaf;
         uintptr_t base;
         uintptr_t frame;
@@ -301 +300 @@
         mutex_lock(&area->sh_info->lock);
         if (area->sh_info->shared) {
-                bool found = false;
-
                 /*
                  * The address space area is shared.
                  */
 
-                frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
-                    upage - area->base, &leaf);
-                if (!frame) {
-                        unsigned int i;
-
-                        /*
-                         * Workaround for valid NULL address.
-                         */
-
-                        for (i = 0; i < leaf->keys; i++) {
-                                if (leaf->key[i] == upage - area->base) {
-                                        found = true;
-                                        break;
-                                }
-                        }
-                }
-                if (frame || found) {
+                errno_t rc = as_pagemap_find(&area->sh_info->pagemap,
+                    upage - area->base, &frame);
+                if (rc == EOK) {
                         frame_reference_add(ADDR2PFN(frame));
                         page_mapping_insert(AS, upage, frame,
@@ -415 +398 @@
         if (dirty && area->sh_info->shared) {
                 frame_reference_add(ADDR2PFN(frame));
-                btree_insert(&area->sh_info->pagemap, upage - area->base,
-                    (void *) frame, leaf);
+                as_pagemap_insert(&area->sh_info->pagemap, upage - area->base,
+                    frame);
         }