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

Timestamp:

2010-04-18T00:24:40Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a80687e5

Parents:

d8e3467

Message:

sysinfo API cleanup

• better support for generated subtrees
• synchronization
• memory management (generated items cleanup)
• simplier sysinfo_dump()

remove separate statistical syscalls, replace with virtual sysinfo items (some functionality is still missing)

• naming consolidation
• cleaner API
• proper synchronization

minor renames

• zone_print_list() → zones_print_list()
• zone_busy_and_free() → zones_stats()

File:

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

kernel/generic/src/mm/frame.c

@@ -1202 +1202 @@
 
 /** Return total size of all zones. */
-uint64_t zone_total_size(void)
+uint64_t zones_total_size(void)
 {
         ipl_t ipl = interrupts_disable();
@@ -1218 +1218 @@
 }
 
-void zone_busy_and_free(uint64_t *out_busy, uint64_t *out_free)
-{
+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);
-
-        uint64_t busy = 0, free = 0;
+        
+        *total = 0;
+        *unavail = 0;
+        *busy = 0;
+        *free = 0;
+        
         size_t i;
         for (i = 0; i < zones.count; i++) {
-                bool available = zone_flags_available(zones.info[i].flags);
-                /* Do not count reserved memory */
-                if (available) {
-                        busy += (uint64_t) FRAMES2SIZE(zones.info[i].busy_count);
-                        free += (uint64_t) FRAMES2SIZE(zones.info[i].free_count);
-                }
-        }
-
+                *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);
-        *out_busy = busy;
-        *out_free = free;
 }
 
 /** Prints list of zones. */
-void zone_print_list(void)
+void zones_print_list(void)
 {
 #ifdef __32_BITS__