Changeset 2b8b0ca in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2008-06-03T14:46:49Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

93a3348

Parents:

0f269c2

Message:

proper printf formatting

File:

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

kernel/generic/src/mm/slab.c

@@ -558 +558 @@
         ASSERT(_slab_initialized >= 2);
 
-        cache->mag_cache = malloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
+        cache->mag_cache = malloc(sizeof(slab_mag_cache_t) * config.cpu_count,0);
         for (i = 0; i < config.cpu_count; i++) {
                 memsetb((uintptr_t)&cache->mag_cache[i],
@@ -814 +814 @@
                 cache = list_get_instance(cur, slab_cache_t, link);
                 
-                printf("%-16s %8zd %6zd %6zd %6zd %6zd %9zd %-3s\n", cache->name, cache->size, (1 << cache->order), cache->objects, atomic_get(&cache->allocated_slabs), atomic_get(&cache->cached_objs), atomic_get(&cache->allocated_objs), cache->flags & SLAB_CACHE_SLINSIDE ? "in" : "out");
+                printf("%-16s %8" PRIs " %6d %6u %6ld %6ld %9ld %-3s\n",
+                        cache->name, cache->size, (1 << cache->order), cache->objects,
+                        atomic_get(&cache->allocated_slabs), atomic_get(&cache->cached_objs),
+                        atomic_get(&cache->allocated_objs), cache->flags & SLAB_CACHE_SLINSIDE ? "in" : "out");
         }
         spinlock_unlock(&slab_cache_lock);
@@ -827 +830 @@
         _slab_cache_create(&mag_cache,
                            "slab_magazine",
-                           sizeof(slab_magazine_t)+SLAB_MAG_SIZE*sizeof(void*),
+                           sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void*),
                            sizeof(uintptr_t),
                            NULL, NULL,
@@ -845 +848 @@
 
         /* Initialize structures for malloc */
-        for (i=0, size=(1<<SLAB_MIN_MALLOC_W);
-             i < (SLAB_MAX_MALLOC_W-SLAB_MIN_MALLOC_W+1);
+        for (i=0, size=(1 << SLAB_MIN_MALLOC_W);
+             i < (SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1);
              i++, size <<= 1) {
                 malloc_caches[i] = slab_cache_create(malloc_names[i],