Changeset c47e1a8 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

kernel/generic/src/mm/frame.c

@@ -43 +43 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/frame.h>
 #include <mm/as.h>
@@ -1033 +1033 @@
                 spinlock_unlock(&zones.lock);
                 interrupts_restore(ipl);
+
+                if (!THREAD)
+                        panic("Cannot wait for memory to become available.");
                 
                 /*
@@ -1202 +1205 @@
 
 /** Return total size of all zones. */
-uint64_t zone_total_size(void)
+uint64_t zones_total_size(void)
 {
         ipl_t ipl = interrupts_disable();
@@ -1218 +1221 @@
 }
 
+void zones_stats(uint64_t *total, uint64_t *unavail, uint64_t *busy,
+    uint64_t *free)
+{
+        ASSERT(total != NULL);
+        ASSERT(unavail != NULL);
+        ASSERT(busy != NULL);
+        ASSERT(free != NULL);
+        
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&zones.lock);
+        
+        *total = 0;
+        *unavail = 0;
+        *busy = 0;
+        *free = 0;
+        
+        size_t i;
+        for (i = 0; i < zones.count; i++) {
+                *total += (uint64_t) FRAMES2SIZE(zones.info[i].count);
+                
+                if (zone_flags_available(zones.info[i].flags)) {
+                        *busy += (uint64_t) FRAMES2SIZE(zones.info[i].busy_count);
+                        *free += (uint64_t) FRAMES2SIZE(zones.info[i].free_count);
+                } else
+                        *unavail += (uint64_t) FRAMES2SIZE(zones.info[i].count);
+        }
+        
+        spinlock_unlock(&zones.lock);
+        interrupts_restore(ipl);
+}
+
 /** Prints list of zones. */
-void zone_print_list(void)
+void zones_print_list(void)
 {
 #ifdef __32_BITS__