Changeset 59adc2b in mainline

Timestamp:

2006-01-08T15:18:33Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

677a6d5

Parents:

1a67595

Message:

Minor changes to 'zone' command

Location:

generic

Files:

• include/mm/buddy.h (modified) (1 diff)
• src/mm/buddy.c (modified) (3 diffs)
• src/mm/frame.c (modified) (2 diffs)

generic/include/mm/buddy.h

@@ -56 +56 @@
 extern bool buddy_system_can_alloc(buddy_system_t *b, __u8 order);
 extern void buddy_system_free(buddy_system_t *b, link_t *block);
-extern void buddy_system_structure_print(buddy_system_t *b);
+extern void buddy_system_structure_print(buddy_system_t *b, size_t elem_size);
 
 

generic/src/mm/buddy.c

@@ -239 +239 @@
  * @param es Element size
  */
-void buddy_system_structure_print(buddy_system_t *b) {
+void buddy_system_structure_print(buddy_system_t *b, size_t elem_size) {
         index_t i;
         count_t cnt, elem_count = 0, block_count = 0;
@@ -245 +245 @@
         
 
-        printf("Order\tStatistics\n");
-        printf("-----\t--------------------------------------\n");
+        printf("Order\tBlocks\tSize    \tBlock size\tElems per block\n");
+        printf("-----\t------\t--------\t----------\t---------------\n");
         
         for (i=0;i < b->max_order; i++) {
@@ -254 +254 @@
                 }
         
-                printf("#%d:\t%d blocks available (%d elements per block)\n", i, cnt, 1 << i);
+                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);
                 
                 block_count += cnt;
                 elem_count += (1 << i) * cnt;
         }
-        printf("-----\t--------------------------------------\n");
+        printf("-----\t------\t--------\t----------\t---------------\n");
         printf("Buddy system contains %d elements (%d blocks)\n" , elem_count, block_count);
 

generic/src/mm/frame.c

@@ -490 +490 @@
         zone_t *zone = NULL;
         link_t *cur;
-        index_t i = 0;
         spinlock_lock(&zone_head_lock);
-        printf("No.\tBase address\tFree Frames\tBusy Frames\n");
-        printf("---\t------------\t-----------\t-----------\n");
+        printf("Base address\tFree Frames\tBusy Frames\n");
+        printf("------------\t-----------\t-----------\n");
         for (cur = zone_head.next; cur != &zone_head; cur = cur->next) {
                 zone = list_get_instance(cur, zone_t, link);
                 spinlock_lock(&zone->lock);
-                printf("%d\t%L\t%d\t\t%d\n",i++,zone->base, zone->free_count, zone->busy_count);
+                printf("%L\t%d\t\t%d\n",zone->base, zone->free_count, zone->busy_count);
         }
         spinlock_unlock(&zone_head_lock);
@@ -537 +536 @@
         
         printf("\nBuddy allocator structures:\n\n");
-        buddy_system_structure_print(zone->buddy_system);
-        
+        buddy_system_structure_print(zone->buddy_system, FRAME_SIZE);
         
         spinlock_unlock(&zone->lock);