Changeset 280a27e in mainline for generic/src/mm

Timestamp:

2006-04-16T13:16:44Z (20 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

50de918

Parents:

c624b96

Message:

Printf ported back from uspace to kernel.
Printf calls changed to match new conventions.

Location:

generic/src/mm

Files:

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

generic/src/mm/buddy.c

@@ -292 +292 @@
                 }
         
-                printf("#%d\t%d\t%dK\t\t%dK\t\t%d\t", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
+                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);
                 if (!list_empty(&b->order[i])) {
                         for (cur = b->order[i].next; cur != &b->order[i]; cur = cur->next) {
@@ -305 +305 @@
         }
         printf("-----\t------\t--------\t----------\t---------------\n");
-        printf("Buddy system contains %d free elements (%d blocks)\n" , elem_count, block_count);
-
-}
+        printf("Buddy system contains %zd free elements (%zd blocks)\n" , elem_count, block_count);
+
+}

generic/src/mm/frame.c

@@ -281 +281 @@
         zone = (zone_t *) b->data;
         index = frame_index(zone, frame);
-        printf("%d", index);
+        printf("%zd", index);
 }                                    
 
@@ -1029 +1029 @@
                 zone = zones.info[i];
                 spinlock_lock(&zone->lock);
-                printf("%d: %L\t%d\t\t%d\n",i,PFN2ADDR(zone->base), 
+                printf("%d: %#X \t%zd\t\t%zd\n",i,PFN2ADDR(zone->base), 
                        zone->free_count, zone->busy_count);
                 spinlock_unlock(&zone->lock);
@@ -1062 +1062 @@
         spinlock_lock(&zone->lock);
         printf("Memory zone information\n");
-        printf("Zone base address: %P\n", PFN2ADDR(zone->base));
-        printf("Zone size: %d frames (%dK)\n", zone->count, ((zone->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("Zone base address: %#zX\n", 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 (%zdK)\n", zone->free_count, (zone->free_count * FRAME_SIZE) >> 10);
         buddy_system_structure_print(zone->buddy_system, FRAME_SIZE);
         

generic/src/mm/slab.c

@@ -793 +793 @@
         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%d\t%d\t%d\t%d\t%d\t%d\t\t%s\n", cache->name, cache->size, 
+                printf("%s\t%zd\t%zd\t%zd\t%zd\t%zd\t%zd\t\t%s\n", cache->name, cache->size, 
                        (1 << cache->order), cache->objects,
                        atomic_get(&cache->allocated_slabs),