Changeset bc504ef2 in mainline

Timestamp:

2006-02-02T16:14:19Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

086d4fd

Parents:

2d43f3e

Message:

Tested basic non-cached slab allocation.

Files:

• arch/mips32/src/mm/tlb.c (modified) (1 diff)
• generic/include/mm/slab.h (modified) (2 diffs)
• generic/src/mm/frame.c (modified) (1 diff)
• generic/src/mm/slab.c (modified) (11 diffs)
• test/mm/slab1/test.c (modified) (2 diffs)

arch/mips32/src/mm/tlb.c

@@ -367 +367 @@
          */
         if (!pte) {
-                printf("No such mapping.\n");
+                printf("No such mapping: %P.\n", badvaddr);
                 return NULL;
         }

generic/include/mm/slab.h

@@ -32 +32 @@
 #include <list.h>
 #include <synch/spinlock.h>
+#include <arch/atomic.h>
 
 /** Initial Magazine size (TODO: dynamically growing magazines) */
@@ -73 +74 @@
 
         /* Statistics */
+        atomic_t allocated_slabs;
+        atomic_t allocated_objs;
 
         /* Slabs */

generic/src/mm/frame.c

@@ -185 +185 @@
                 v = PA2KA(v);
         
-        if (flags & FRAME_ATOMIC) {
-                ASSERT(status != NULL);
+        if (status)
                 *status = FRAME_OK;
-        }
+
         if (pzone)
                 *pzone = zone;

generic/src/mm/slab.c

@@ -70 +70 @@
         zone_t *zone = NULL;
         int status;
+        frame_t *frame;
 
         data = (void *)frame_alloc(FRAME_KA | flags, cache->order, &status, &zone);
-        if (status != FRAME_OK)
+        if (status != FRAME_OK) {
                 return NULL;
-
+        }
         if (! cache->flags & SLAB_CACHE_SLINSIDE) {
                 slab = malloc(sizeof(*slab)); // , flags);
@@ -85 +86 @@
                 slab = data + fsize - sizeof(*slab);
         }
-
+                
         /* Fill in slab structures */
         /* TODO: some better way of accessing the frame */
         for (i=0; i< (1<<cache->order); i++) {
-                ADDR2FRAME(zone, (__address)(data+i*PAGE_SIZE))->parent = slab;
+                frame = ADDR2FRAME(zone, KA2PA((__address)(data+i*PAGE_SIZE)));
+                frame->parent = slab;
         }
 
@@ -98 +100 @@
         for (i=0; i<cache->objects;i++)
                 *((int *) (slab->start + i*cache->size)) = i+1;
+
+        atomic_inc(&cache->allocated_slabs);
+
         return slab;
 }
@@ -111 +116 @@
         if (! cache->flags & SLAB_CACHE_SLINSIDE)
                 free(slab);
+
+        atomic_dec(&cache->allocated_slabs);
+        
         return 1 << cache->order;
 }
@@ -154 +162 @@
                 /* It was in full, move to partial */
                 list_remove(&slab->link);
-                list_prepend(&cache->partial_slabs, &slab->link);
+                list_prepend(&slab->link, &cache->partial_slabs);
         }
         if (slab->available == cache->objects) {
@@ -192 +200 @@
                 slab = slab_space_alloc(cache, flags);
                 spinlock_lock(&cache->lock);
-                if (!slab)
+                if (!slab) {
                         return NULL;
+                }
         } else {
                 slab = list_get_instance(cache->partial_slabs.next,
@@ -204 +213 @@
         slab->available--;
         if (! slab->available)
-                list_prepend(&cache->full_slabs, &slab->link);
+                list_prepend(&slab->link, &cache->full_slabs);
         else
-                list_prepend(&cache->partial_slabs, &slab->link);
+                list_prepend(&slab->link, &cache->partial_slabs);
         return obj;
 }
@@ -316 +325 @@
                 if (!mag || mag->size == mag->busy) {
                         if (mag) 
-                                list_prepend(&cache->magazines, &mag->link);
+                                list_prepend(&mag->link, &cache->magazines);
 
                         mag = slab_alloc(&mag_cache, FRAME_ATOMIC | FRAME_NO_RECLAIM);
@@ -534 +543 @@
         }
 
+        if (result)
+                atomic_inc(&cache->allocated_objs);
+
         interrupts_restore(ipl);
+
 
         return result;
@@ -553 +566 @@
                 spinlock_unlock(&cache->lock);
         }
+        atomic_dec(&cache->allocated_objs);
         interrupts_restore(ipl);
 }
@@ -583 +597 @@
 
         spinlock_lock(&slab_cache_lock);
-        printf("SLAB name\tOsize\tOrder\n");
+        printf("SLAB name\tOsize\tOrder\tOcnt\tSlabs\tAllocobjs\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\n", cache->name, cache->size, cache->order);
+                printf("%s\t%d\t%d\t%d\t%d\t%d\n", cache->name, cache->size, 
+                       cache->order, cache->objects,
+                       atomic_get(&cache->allocated_slabs), 
+                       atomic_get(&cache->allocated_objs));
         }
         spinlock_unlock(&slab_cache_lock);

test/mm/slab1/test.c

@@ -44 +44 @@
         printf("Creating cache.\n");
         cache = slab_cache_create("test_cache", VAL_SIZE, 0, NULL, NULL, SLAB_CACHE_NOMAGAZINE);
-        slab_print_list();
         printf("Destroying cache.\n");
         slab_cache_destroy(cache);
@@ -62 +61 @@
         }
         printf("done.\n");
+
+        printf("Allocating %d items...", VAL_COUNT);
+        for (i=0; i < VAL_COUNT; i++) {
+                data[i] = slab_alloc(cache, 0);
+        }
+        printf("done.\n");
+
+        slab_print_list();
+        printf("Freeing %d items...", VAL_COUNT/2);
+        for (i=VAL_COUNT-1; i >= VAL_COUNT/2; i--) {
+                slab_free(cache, data[i]);
+        }
+        printf("done.\n");      
+
+        printf("Allocating %d items...", VAL_COUNT/2);
+        for (i=VAL_COUNT/2; i < VAL_COUNT; i++) {
+                data[i] = slab_alloc(cache, 0);
+        }
+        printf("done.\n");
+        printf("Freeing %d items...", VAL_COUNT);
+        for (i=0; i < VAL_COUNT; i++) {
+                slab_free(cache, data[i]);
+        }
+        printf("done.\n");      
+        slab_print_list();
+        slab_cache_destroy(cache);
+
+        printf("Test complete.\n");
 }