Changeset 371bd7d in mainline for kernel/generic/src/mm/as.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Message:

Merge mainline changes.

File:

• kernel/generic/src/mm/as.c (modified) (5 diffs)

kernel/generic/src/mm/as.c

@@ -75 +75 @@
 #include <config.h>
 #include <align.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <syscall/copy.h>
 #include <arch/interrupt.h>
@@ -784 +784 @@
 {
         as_area_t *area;
-        uintptr_t base;
         link_t *cur;
         ipl_t ipl;
@@ -813 +812 @@
                 return ENOTSUP;
         }
-
-        base = area->base;
 
         /*
@@ -952 +949 @@
         if (!THREAD)
                 return AS_PF_FAULT;
-                
-        ASSERT(AS);
-
+        
+        if (!AS)
+                return AS_PF_FAULT;
+        
         mutex_lock(&AS->lock);
-        area = find_area_and_lock(AS, page);    
+        area = find_area_and_lock(AS, page);
         if (!area) {
                 /*
@@ -1920 +1918 @@
 }
 
+/** Get list of adress space areas.
+ *
+ * @param as            Address space.
+ * @param obuf          Place to save pointer to returned buffer.
+ * @param osize         Place to save size of returned buffer.
+ */
+void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
+{
+        ipl_t ipl;
+        size_t area_cnt, area_idx, i;
+        link_t *cur;
+
+        as_area_info_t *info;
+        size_t isize;
+
+        ipl = interrupts_disable();
+        mutex_lock(&as->lock);
+
+        /* First pass, count number of areas. */
+
+        area_cnt = 0;
+
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+                area_cnt += node->keys;
+        }
+
+        isize = area_cnt * sizeof(as_area_info_t);
+        info = malloc(isize, 0);
+
+        /* Second pass, record data. */
+
+        area_idx = 0;
+
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node;
+
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+
+                for (i = 0; i < node->keys; i++) {
+                        as_area_t *area = node->value[i];
+
+                        ASSERT(area_idx < area_cnt);
+                        mutex_lock(&area->lock);
+
+                        info[area_idx].start_addr = area->base;
+                        info[area_idx].size = FRAMES2SIZE(area->pages);
+                        info[area_idx].flags = area->flags;
+                        ++area_idx;
+
+                        mutex_unlock(&area->lock);
+                }
+        }
+
+        mutex_unlock(&as->lock);
+        interrupts_restore(ipl);
+
+        *obuf = info;
+        *osize = isize;
+}
+
+
 /** Print out information about address space.
  *