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

Timestamp:

2008-07-06T18:20:02Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5f7a0ef

Parents:

000350f8

Message:

Avoid deadlock during the 'zone n' kconsole command. Buddy allocator detail is
no longer printed because the effort to avoid the deadlock was simply not worth
it.

File:

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

kernel/generic/src/mm/frame.c

@@ -319 +319 @@
 }
 
-static void zone_buddy_print_id(buddy_system_t *b, link_t *block)
-{
-        frame_t *frame;
-        zone_t *zone;
-        index_t index;
-
-        frame = list_get_instance(block, frame_t, buddy_link);
-        zone = (zone_t *) b->data;
-        index = frame_index(zone, frame);
-        printf("%" PRIi, index);
-}                                    
-
 /** Buddy system find_buddy implementation.
  *
@@ -470 +458 @@
         .mark_busy = zone_buddy_mark_busy,
         .mark_available = zone_buddy_mark_available,
-        .find_block = zone_buddy_find_block,
-        .print_id = zone_buddy_print_id
+        .find_block = zone_buddy_find_block
 };
 
@@ -1284 +1271 @@
         ipl_t ipl;
         unsigned int i;
+        uintptr_t base;
+        count_t count;
+        count_t busy_count;
+        count_t free_count;
 
         ipl = interrupts_disable();
@@ -1295 +1286 @@
         }
         if (!zone) {
+                spinlock_unlock(&zones.lock);
+                interrupts_restore(ipl);
                 printf("Zone not found.\n");
-                goto out;
+                return;
         }
         
         spinlock_lock(&zone->lock);
-        printf("Memory zone information\n");
-        printf("Zone base address: %p\n", PFN2ADDR(zone->base));
-        printf("Zone size: %" PRIc " frames (%" PRIs " KB)\n", zone->count,
-            SIZE2KB(FRAMES2SIZE(zone->count)));
-        printf("Allocated space: %" PRIc " frames (%" PRIs " KB)\n",
-            zone->busy_count, SIZE2KB(FRAMES2SIZE(zone->busy_count)));
-        printf("Available space: %" PRIc " frames (%" PRIs " KB)\n",
-            zone->free_count, SIZE2KB(FRAMES2SIZE(zone->free_count)));
-        buddy_system_structure_print(zone->buddy_system, FRAME_SIZE);
+        base = PFN2ADDR(zone->base);
+        count = zone->count;
+        busy_count = zone->busy_count;
+        free_count = zone->free_count;
         spinlock_unlock(&zone->lock);
-        
-out:
         spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
+
+        printf("Zone base address: %p\n", base);
+        printf("Zone size: %" PRIc " frames (%" PRIs " KiB)\n", count,
+            SIZE2KB(FRAMES2SIZE(count)));
+        printf("Allocated space: %" PRIc " frames (%" PRIs " KiB)\n",
+            busy_count, SIZE2KB(FRAMES2SIZE(busy_count)));
+        printf("Available space: %" PRIc " frames (%" PRIs " KiB)\n",
+            free_count, SIZE2KB(FRAMES2SIZE(free_count)));
 }