Changeset 14e5d88 in mainline for generic/src

Timestamp:

2006-02-02T21:46:47Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

4a5b2b0e

Parents:

086d4fd

Message:

Basic SLAB (without CPU-cache) passes test.

File:

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

generic/src/mm/slab.c

@@ -89 +89 @@
         /* Fill in slab structures */
         /* TODO: some better way of accessing the frame */
-        for (i=0; i< (1<<cache->order); i++) {
+        for (i=0; i < (1 << cache->order); i++) {
                 frame = ADDR2FRAME(zone, KA2PA((__address)(data+i*PAGE_SIZE)));
                 frame->parent = slab;
@@ -107 +107 @@
 
 /**
- * Free space associated with SLAB
+ * Deallocate space associated with SLAB
  *
  * @return number of freed frames
@@ -151 +151 @@
         if (!slab)
                 slab = obj2slab(obj);
-
-        spinlock_lock(&cache->lock);
 
         *((int *)obj) = slab->nextavail;
@@ -172 +170 @@
                 spinlock_lock(&cache->lock);
         }
-
-        spinlock_unlock(&cache->lock);
 
         return frames;
@@ -389 +385 @@
         cache->name = name;
 
-        if (align)
-                size = ALIGN_UP(size, align);
+        if (align < sizeof(__native))
+                align = sizeof(__native);
+        size = ALIGN_UP(size, align);
+                
         cache->size = size;
 
@@ -412 +410 @@
 
         /* Minimum slab order */
-        cache->order = (cache->size >> PAGE_WIDTH) + 1;
-                
+        cache->order = (cache->size-1) >> PAGE_WIDTH;
+
         while (badness(cache) > SLAB_MAX_BADNESS(cache)) {
                 cache->order += 1;
         }
-
         cache->objects = comp_objects(cache);
+        /* If info fits in, put it inside */
+        if (badness(cache) > sizeof(slab_t))
+                cache->flags |= SLAB_CACHE_SLINSIDE;
 
         spinlock_lock(&slab_cache_lock);
@@ -597 +597 @@
 
         spinlock_lock(&slab_cache_lock);
-        printf("SLAB name\tOsize\tOrder\tOcnt\tSlabs\tAllocobjs\n");
+        printf("SLAB name\tOsize\tPages\tOcnt\tSlabs\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%d\t%d\t%d\t%d\t%d\n", cache->name, cache->size, 
-                       cache->order, cache->objects,
+                printf("%s\t%d\t%d\t%d\t%d\t%d\t\t%s\n", cache->name, cache->size, 
+                       (1 << cache->order), cache->objects,
                        atomic_get(&cache->allocated_slabs), 
-                       atomic_get(&cache->allocated_objs));
+                       atomic_get(&cache->allocated_objs),
+                       cache->flags & SLAB_CACHE_SLINSIDE ? "In" : "Out");
         }
         spinlock_unlock(&slab_cache_lock);