Changeset 2031 for Whitix/trunk

Timestamp:

04/02/09 21:32:43 (3 years ago)

Author:

mwhitworth

Message:

Fix KE_OBJECT_TYPE, use new bit functions.

Files:

• Whitix/trunk/memory/slab.c (modified) (14 diffs)

Whitix/trunk/memory/slab.c

@@ -17 +17 @@
  */
 
+#define DEBUG_ASSERTS
+
+#include <assert.h>
 #include <bitmap.h>
 #include <module.h>
@@ -24 +27 @@
 #include <slab.h>
 #include <keobject.h>
+#include <locks.h>
 
 /* 
@@ -52 +56 @@
 };
 
-KE_OBJECT_TYPE(cacheType, NULL, cacheAttributes, OffsetOf(struct Cache, object));
+KE_OBJECT_TYPE(cacheType, NULL);
 
 static int slabInfoSetup = 0;
 
 /* General slab limits */
-#define SLAB_START 0xC0000000
+#define SLAB_START 0xC2000000
 #define SLAB_END   0xD0000000
 
@@ -78 +82 @@
         DWORD size;
         struct Cache* cache;
+        char* name;
 };
 
@@ -83 +88 @@
 
 static struct CacheSize cacheSizes[]={
-        {16,NULL},
-        {32,NULL},
-        {64,NULL},
-        {128,NULL},
-        {256,NULL},
-        {512,NULL},
-        {1024,NULL},
-        {2048,NULL},
-        {4096,NULL},
-        {8192,NULL},
-        {16384,NULL},
-        {32768,NULL},
-        {65536,NULL},
-        {131072,NULL}, /* 128k */
-};
-
-const char* mallocNames[]=
-{
-        "Malloc16",
-        "Malloc32",
-        "Malloc64",
-        "Malloc128",
-        "Malloc256",
-        "Malloc512",
-        "Malloc1024",
-        "Malloc2048",
-        "Malloc4096",
-        "Malloc8192",
-        "Malloc16384",
-        "Malloc32768",
-        "Malloc65536",
-        "Malloc131072",
+        {16,NULL, "Malloc16"},
+        {32,NULL, "Malloc32"},
+        {64,NULL, "Malloc64"},
+        {128,NULL, "Malloc128"},
+        {256,NULL, "Malloc256"},
+        {512,NULL, "Malloc512"},
+        {1024,NULL, "Malloc1024"},
+        {2048,NULL, "Malloc2048"},
+        {4096,NULL, "Malloc4096"},
+        {8192,NULL, "Malloc8192"},
+        {16384,NULL, "Malloc16384"},
+        {32768,NULL, "Malloc32768"},
+        {65536,NULL, "Malloc65536"},
+        {131072,NULL, "Malloc131072"}, /* 128k */
 };
 
@@ -169 +156 @@
 
         /* And zero out the memory concerned */
-        BmapSetBit(slab->bitmap, i, false);
+        BitClear(slab->bitmap, i);
+        
         slab->isFull=0; /* At least 1 piece is free now */
 
@@ -234 +222 @@
                 return NULL;
 
+        /* Allocate from a slab cache (which does keep its info on slab). */
         if (cache->options & SLAB_OFFSLAB)
         {
-                /* Allocate from a slab cache, which does keep it's info on slab */
                 slab=(struct Slab*)MemCacheAlloc(slabCache);
         }else
@@ -242 +230 @@
 
         /* Slab setup is performed here. ZeroMemory call also zeros the bitmap. */
-        ZeroMemory(slab,sizeof(struct Slab));
+        ZeroMemory(slab, sizeof(struct Slab));
         slab->page=virtAddr;
 
@@ -340 +328 @@
                 if (!currSlab->isFull)
                 {
-                        /* Search the bitmap */
-                        for (i=0; i<cache->numObjs; i++)
+                        i = BitFindFirstZero(currSlab->bitmap, cache->numObjs);
+                        
+                        if (i < cache->numObjs)
                         {
-                                if (!BmapGetBit(currSlab->bitmap,i))
-                                {
-                                        BmapSetBit(currSlab->bitmap,i,true);
-                                        if (i == cache->numObjs-1)
-                                                currSlab->isFull=1;
-                                        
-                                        if (!cache->ctor)       
-                                                ZeroMemory(currSlab->page+cache->offset+(i*cache->size), cache->size);
-
-                                        IrqRestoreFlags(flags);
-                                        return (void*)(currSlab->page+cache->offset+(i*cache->size));
-                                }
+                                BitSet(currSlab->bitmap, i);
+                        
+                                if (i == cache->numObjs-1)
+                                        currSlab->isFull=1;
+
+                                IrqRestoreFlags(flags);
+                                return (void*)(currSlab->page+cache->offset+(i*cache->size));
                         }
                 }
@@ -417 +401 @@
 {
         struct Cache* retVal;
+        DWORD flags;
 
         if (!size)
@@ -437 +422 @@
                 retVal->numPages=1;
 
-        retVal->ctor=ctor;
-        retVal->dtor=dtor;
+        retVal->ctor = ctor;
+        retVal->dtor = dtor;
         retVal->name = name;
 
@@ -452 +437 @@
                 KeObjectCreate(&retVal->object, &cacheSet, name);
 
+        IrqSaveFlags(flags);
         ListAddTail(&retVal->list, &cacheList);
+        IrqRestoreFlags(flags);
 
         return retVal;
@@ -461 +448 @@
 int SlabInfoInit()
 {
-        KeSetCreate(&cacheSet, NULL, &cacheType, "Memory");
-        
         /* Register all the caches created so far. */
         struct Cache* cache;
         
+        KeSetCreate(&cacheSet, NULL, &cacheType, "Memory");
+
+        PreemptDisable();
+        
         ListForEachEntry(cache, &cacheList, list)
-        {
                 KeObjectCreate(&cache->object, &cacheSet, cache->name);
-        }
         
         slabInfoSetup = 1;
+        
+        PreemptEnable();
         
         return 0;
@@ -490 +479 @@
         for (i=0; i<count(cacheSizes); i++)
         {
-                cacheSizes[i].cache=MemCacheCreate(mallocNames[i], cacheSizes[i].size, NULL, NULL, 0);
+                cacheSizes[i].cache=MemCacheCreate(cacheSizes[i].name, cacheSizes[i].size, NULL, NULL, 0);
                 
                 if (!cacheSizes[i].cache)