Changeset 263104b in mainline

Timestamp:

2006-01-10T22:43:40Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0369911

Parents:

e30bc2a

Message:

Fix zone_print_one() and zone_print_list().

• add missing spinlock_unlock()
• add missing interrupts_disable() and interrupts_restore()

Coding style fixes and cleanup.

Location:

generic/src/mm

Files:

• buddy.c (modified) (3 diffs)
• frame.c (modified) (9 diffs)

generic/src/mm/buddy.c

@@ -232 +232 @@
 }
 
-
-
 /** Prints out structure of buddy system
  *
@@ -251 +249 @@
                 cnt = 0;
                 if (!list_empty(&b->order[i])) {
-                        for (cur = b->order[i].next; cur != &b->order[i]; cur = cur->next) cnt++;
-                }
-        
-                printf("#%d\t%d\t%d kb\t\t%d kb\t\t%d\n", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
+                        for (cur = b->order[i].next; cur != &b->order[i]; cur = cur->next)
+                                cnt++;
+                }
+        
+                printf("#%d\t%d\t%dK\t\t%dK\t\t%d\n", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
                 
                 block_count += cnt;
@@ -260 +259 @@
         }
         printf("-----\t------\t--------\t----------\t---------------\n");
-        printf("Buddy system contains %d elements (%d blocks)\n" , elem_count, block_count);
-
-}
+        printf("Buddy system contains %d free elements (%d blocks)\n" , elem_count, block_count);
+
+}

generic/src/mm/frame.c

@@ -118 +118 @@
                         panic("Can't allocate frame.\n");
                 
-                
-                
                 /*
                  * TODO: Sleep until frames are available again.
@@ -155 +153 @@
         spinlock_unlock(&zone_head_lock);
         interrupts_restore(ipl);
-
 
         if (flags & FRAME_KA)
@@ -206 +203 @@
                         break;
                 }
+
                 spinlock_unlock(&z->lock);
         }
@@ -503 +501 @@
         zone_t *zone = NULL;
         link_t *cur;
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
         spinlock_lock(&zone_head_lock);
         printf("Base address\tFree Frames\tBusy Frames\n");
@@ -510 +511 @@
                 spinlock_lock(&zone->lock);
                 printf("%L\t%d\t\t%d\n",zone->base, zone->free_count, zone->busy_count);
+                spinlock_unlock(&zone->lock);
         }
         spinlock_unlock(&zone_head_lock);
-
+        interrupts_restore(ipl);
 }
 
@@ -522 +524 @@
         zone_t *zone = NULL, *z ;
         link_t *cur;
-        
-        
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
         spinlock_lock(&zone_head_lock);
-        
         
         for (cur = zone_head.next; cur != &zone_head; cur = cur->next) {
@@ -535 +537 @@
         }
         
-        
         if (!zone) {
+                spinlock_unlock(&zone_head_lock);
+                interrupts_restore(ipl);
                 printf("No zone with address %X\n", base);
                 return;
@@ -544 +547 @@
         printf("Memory zone information\n\n");
         printf("Zone base address: %P\n", zone->base);
-        printf("Zone size: %d frames (%d kbytes)\n", zone->free_count + zone->busy_count, ((zone->free_count + zone->busy_count) * FRAME_SIZE) >> 10);
-        printf("Allocated space: %d frames (%d kbytes)\n", zone->busy_count, (zone->busy_count * FRAME_SIZE) >> 10);
-        printf("Available space: %d (%d kbytes)\n", zone->free_count, (zone->free_count * FRAME_SIZE) >> 10);
+        printf("Zone size: %d frames (%dK)\n", zone->free_count + zone->busy_count, ((zone->free_count + zone->busy_count) * FRAME_SIZE) >> 10);
+        printf("Allocated space: %d frames (%dK)\n", zone->busy_count, (zone->busy_count * FRAME_SIZE) >> 10);
+        printf("Available space: %d (%dK)\n", zone->free_count, (zone->free_count * FRAME_SIZE) >> 10);
         
         printf("\nBuddy allocator structures:\n\n");
@@ -553 +556 @@
         spinlock_unlock(&zone->lock);
         spinlock_unlock(&zone_head_lock);
-        
-}
-
+        interrupts_restore(ipl);
+}
+