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

Timestamp:

2008-02-06T14:24:13Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7208b6c

Parents:

1b067315

Message:

remove config.memory_size, get_memory_size() and memory_init.{c|d}
the amount of available memory can be calculated from the sizes of the zones
add FRAMES2SIZE, SIZE2KB and SIZE2MB functions/macros (code readability)

File:

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

kernel/generic/src/mm/frame.c

@@ -105 +105 @@
 
 
-/*********************************/
+/********************/
 /* Helper functions */
+/********************/
+
 static inline index_t frame_index(zone_t *zone, frame_t *frame)
 {
-        return (index_t)(frame - zone->frames);
-}
+        return (index_t) (frame - zone->frames);
+}
+
 static inline index_t frame_index_abs(zone_t *zone, frame_t *frame)
 {
-        return (index_t)(frame - zone->frames) + zone->base;
-}
+        return (index_t) (frame - zone->frames) + zone->base;
+}
+
 static inline int frame_index_valid(zone_t *zone, index_t index)
 {
-        return index >= 0 && index < zone->count;
+        return (index >= 0) && (index < zone->count);
 }
 
@@ -123 +127 @@
 static index_t make_frame_index(zone_t *zone, frame_t *frame)
 {
-        return frame - zone->frames;
+        return (frame - zone->frames);
 }
 
@@ -138 +142 @@
 }
 
-/*************************************/
+/**********************/
 /* Zoneinfo functions */
+/**********************/
 
 /**
@@ -155 +160 @@
         ipl = interrupts_disable();
         spinlock_lock(&zones.lock);
+        
         /* Try to merge */
-        if (zones.count + 1 == ZONES_MAX)
-                panic("Maximum zone(%d) count exceeded.", ZONES_MAX);
+        if (zones.count + 1 == ZONES_MAX) {
+                printf("Maximum zone count %u exceeded!\n", ZONES_MAX);
+                spinlock_unlock(&zones.lock);
+                interrupts_restore(ipl);
+                return -1;
+        }
+        
         for (i = 0; i < zones.count; i++) {
                 /* Check for overflow */
                 z = zones.info[i];
-                if (overlaps(newzone->base,newzone->count, z->base,
-                    z->count)) {
+                if (overlaps(newzone->base, newzone->count, z->base, z->count)) {
                         printf("Zones overlap!\n");
                         return -1;
@@ -169 +179 @@
                         break;
         }
+        
         /* Move other zones up */
         for (j = i; j < zones.count; j++)
                 zones.info[j + 1] = zones.info[j];
+        
         zones.info[i] = newzone;
         zones.count++;
+        
         spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
@@ -182 +195 @@
 /**
  * Try to find a zone where can we find the frame
- 
+ *
  * Assume interrupts are disabled.
- 
+ *
  * @param frame Frame number contained in zone
  * @param pzone If not null, it is used as zone hint. Zone index
@@ -901 +914 @@
         }
 
-        z = (zone_t *)PA2KA(PFN2ADDR(confframe));
+        z = (zone_t *) PA2KA(PFN2ADDR(confframe));
         zone_construct(start, count, z, flags);
         znum = zones_add_zone(z);
@@ -1110 +1123 @@
 
 
+/** Return total size of all zones
+ *
+ */
+uint64_t zone_total_size(void) {
+        zone_t *zone = NULL;
+        unsigned int i;
+        ipl_t ipl;
+        uint64_t total = 0;
+
+        ipl = interrupts_disable();
+        spinlock_lock(&zones.lock);
+        
+        for (i = 0; i < zones.count; i++) {
+                zone = zones.info[i];
+                spinlock_lock(&zone->lock);
+                total += (uint64_t) FRAMES2SIZE(zone->count);
+                spinlock_unlock(&zone->lock);
+        }
+        
+        spinlock_unlock(&zones.lock);
+        interrupts_restore(ipl);
+        
+        return total;
+}
+
+
 
 /** Prints list of zones
@@ -1161 +1200 @@
 
         for (i = 0; i < zones.count; i++) {
-                if (i == num || PFN2ADDR(zones.info[i]->base) == num) {
+                if ((i == num) || (PFN2ADDR(zones.info[i]->base) == num)) {
                         zone = zones.info[i];
                         break;
@@ -1175 +1214 @@
         printf("Zone base address: %#.*p\n", sizeof(uintptr_t) * 2,
             PFN2ADDR(zone->base));
-        printf("Zone size: %zd frames (%zdK)\n", zone->count,
-            ((zone->count) * FRAME_SIZE) >> 10);
-        printf("Allocated space: %zd frames (%zdK)\n", zone->busy_count,
-            (zone->busy_count * FRAME_SIZE) >> 10);
-        printf("Available space: %zd frames (%zdK)\n", zone->free_count,
-            (zone->free_count * FRAME_SIZE) >> 10);
+        printf("Zone size: %zd frames (%zd KB)\n", zone->count,
+                SIZE2KB(FRAMES2SIZE(zone->count)));
+        printf("Allocated space: %zd frames (%zd KB)\n", zone->busy_count,
+                SIZE2KB(FRAMES2SIZE(zone->busy_count)));
+        printf("Available space: %zd frames (%zd KB)\n", zone->free_count,
+                SIZE2KB(FRAMES2SIZE(zone->free_count)));
         buddy_system_structure_print(zone->buddy_system, FRAME_SIZE);
-        
         spinlock_unlock(&zone->lock);
+        
 out:
         spinlock_unlock(&zones.lock);