Changeset 085d973 in mainline for generic/src/mm/slab.c

Timestamp:

2006-02-08T12:34:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

5e3757d

Parents:

eb1b8b6

Message:

Cleanup o frame allocator.
Removed early_malloc & initial heap.
Will break ia64, ppc & sparc.
Added e820 table print.

File:

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

generic/src/mm/slab.c

@@ -97 +97 @@
 #include <memstr.h>
 #include <align.h>
-#include <mm/heap.h>
 #include <mm/frame.h>
 #include <config.h>
@@ -155 +154 @@
         size_t fsize;
         int i;
-        zone_t *zone = NULL;
         int status;
-        frame_t *frame;
-
-        data = (void *)frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
+        pfn_t pfn;
+        int zone=0;
+        
+        pfn = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
+        data = (void *) PA2KA(PFN2ADDR(pfn));
         if (status != FRAME_OK) {
                 return NULL;
@@ -166 +166 @@
                 slab = slab_alloc(slab_extern_cache, flags);
                 if (!slab) {
-                        frame_free((__address)data);
+                        frame_free(ADDR2PFN(KA2PA(data)));
                         return NULL;
                 }
@@ -175 +175 @@
                 
         /* Fill in slab structures */
-        /* TODO: some better way of accessing the frame */
-        for (i=0; i < (1 << cache->order); i++) {
-                frame = ADDR2FRAME(zone, KA2PA((__address)(data+i*PAGE_SIZE)));
-                frame->parent = slab;
-        }
+        for (i=0; i < (1 << cache->order); i++)
+                frame_set_parent(pfn+i, slab, zone);
 
         slab->start = data;
@@ -200 +197 @@
 static count_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
-        frame_free((__address)slab->start);
+        frame_free(ADDR2PFN(KA2PA(slab->start)));
         if (! (cache->flags & SLAB_CACHE_SLINSIDE))
                 slab_free(slab_extern_cache, slab);
@@ -212 +209 @@
 static slab_t * obj2slab(void *obj)
 {
-        frame_t *frame; 
-
-        frame = frame_addr2frame((__address)obj);
-        return (slab_t *)frame->parent;
+        return (slab_t *)frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
 }
 
@@ -726 +720 @@
         ipl = interrupts_disable();
 
-        if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))
+        if (!(cache->flags & SLAB_CACHE_NOMAGAZINE)) {
                 result = magazine_obj_get(cache);
+        }
         if (!result)
                 result = slab_obj_create(cache, flags);