Changeset 6c441cf8 in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2008-02-27T11:49:17Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

56976a17

Parents:

fdb7795

Message:

code cleanup (mostly signed/unsigned)
allow extra compiler warnings

File:

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

kernel/generic/src/mm/slab.c

@@ -173 +173 @@
         slab_t *slab;
         size_t fsize;
-        int i;
+        unsigned int i;
         unsigned int zone = 0;
         
@@ -192 +192 @@
         
         /* Fill in slab structures */
-        for (i=0; i < (1 << cache->order); i++)
-                frame_set_parent(ADDR2PFN(KA2PA(data))+i, slab, zone);
+        for (i = 0; i < ((unsigned int) 1 << cache->order); i++)
+                frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone);
 
         slab->start = data;
@@ -200 +200 @@
         slab->cache = cache;
 
-        for (i=0; i<cache->objects;i++)
+        for (i = 0; i < cache->objects; i++)
                 *((int *) (slab->start + i*cache->size)) = i+1;
 
@@ -372 +372 @@
                                 slab_magazine_t *mag)
 {
-        int i;
+        unsigned int i;
         count_t frames = 0;
 
-        for (i=0;i < mag->busy; i++) {
+        for (i = 0; i < mag->busy; i++) {
                 frames += slab_obj_destroy(cache, mag->objs[i], NULL);
                 atomic_dec(&cache->cached_objs);
@@ -528 +528 @@
 
 /** Return number of objects that fit in certain cache size */
-static int comp_objects(slab_cache_t *cache)
+static unsigned int comp_objects(slab_cache_t *cache)
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -537 +537 @@
 
 /** Return wasted space in slab */
-static int badness(slab_cache_t *cache)
-{
-        int objects;
-        int ssize;
+static unsigned int badness(slab_cache_t *cache)
+{
+        unsigned int objects;
+        unsigned int ssize;
 
         objects = comp_objects(cache);
@@ -546 +546 @@
         if (cache->flags & SLAB_CACHE_SLINSIDE)
                 ssize -= sizeof(slab_t);
-        return ssize - objects*cache->size;
+        return ssize - objects * cache->size;
 }
 
@@ -554 +554 @@
 static void make_magcache(slab_cache_t *cache)
 {
-        int i;
+        unsigned int i;
         
         ASSERT(_slab_initialized >= 2);
 
         cache->mag_cache = malloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
-        for (i=0; i < config.cpu_count; i++) {
+        for (i = 0; i < config.cpu_count; i++) {
                 memsetb((uintptr_t)&cache->mag_cache[i],
                         sizeof(cache->mag_cache[i]), 0);
-                spinlock_initialize(&cache->mag_cache[i].lock, 
-                                    "slab_maglock_cpu");
+                spinlock_initialize(&cache->mag_cache[i].lock, "slab_maglock_cpu");
         }
 }
@@ -655 +654 @@
 static count_t _slab_reclaim(slab_cache_t *cache, int flags)
 {
-        int i;
+        unsigned int i;
         slab_magazine_t *mag;
         count_t frames = 0;
@@ -676 +675 @@
                 /* Free cpu-bound magazines */
                 /* Destroy CPU magazines */
-                for (i=0; i<config.cpu_count; i++) {
+                for (i = 0; i < config.cpu_count; i++) {
                         spinlock_lock(&cache->mag_cache[i].lock);