Changeset ad45bde9 in mainline for generic/src/mm

Timestamp:

2006-04-23T14:17:44Z (20 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

1f41004e

Parents:

6ecc8bce

Message:

Fix pointers output format.
Fix format of slab and zones tables.

Location:

generic/src/mm

Files:

• buddy.c (modified) (1 diff)
• frame.c (modified) (2 diffs)
• slab.c (modified) (1 diff)

generic/src/mm/buddy.c

@@ -292 +292 @@
                 }
         
-                printf("#%zd\t%zd\t%zdK\t\t%zdK\t\t%zd\t", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
+                printf("#%zd\t%5zd\t%7zdK\t%8zdK\t%6zd\t", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
                 if (!list_empty(&b->order[i])) {
                         for (cur = b->order[i].next; cur != &b->order[i]; cur = cur->next) {

generic/src/mm/frame.c

@@ -1029 +1029 @@
                 zone = zones.info[i];
                 spinlock_lock(&zone->lock);
-                printf("%d: %#x \t%zd\t\t%zd\n", i, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
+                printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(__address) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
                 spinlock_unlock(&zone->lock);
         }
@@ -1061 +1061 @@
         spinlock_lock(&zone->lock);
         printf("Memory zone information\n");
-        printf("Zone base address: %#zX\n", PFN2ADDR(zone->base));
+        printf("Zone base address: %#.*p\n", sizeof(__address) * 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);

generic/src/mm/slab.c

@@ -790 +790 @@
         ipl = interrupts_disable();
         spinlock_lock(&slab_cache_lock);
-        printf("SLAB name\tOsize\tPages\tObj/pg\tSlabs\tCached\tAllocobjs\tCtl\n");
+        printf("SLAB name\t  Osize\t  Pages\t Obj/pg\t  Slabs\t Cached\tAllocobjs\tCtl\n");
         for (cur = slab_cache_list.next;cur!=&slab_cache_list; cur=cur->next) {
                 cache = list_get_instance(cur, slab_cache_t, link);
-                printf("%s\t%zd\t%zd\t%zd\t%zd\t%zd\t%zd\t\t%s\n", cache->name, cache->size, 
+                printf("%s\t%7zd\t%7zd\t%7zd\t%7zd\t%7zd\t%7zd\t\t%s\n", cache->name, cache->size, 
                        (1 << cache->order), cache->objects,
                        atomic_get(&cache->allocated_slabs),