Changeset 541 for Whitix/branches/hybrid/memory/slab.c

Timestamp:

05/24/08 09:55:50 (6 months ago)

Author:

mwhitworth

Message:

Update build process.

Files:

• Whitix/branches/hybrid/memory/slab.c (modified) (7 diffs)

Whitix/branches/hybrid/memory/slab.c

@@ -22 +22 @@
 #include <error.h>
 #include <i386/i386.h>
+#include <imports.h>
 
 /* 
@@ -97 +98 @@
         if (i == count(cacheSizes)) /* Too big */
         {
-                printf("malloc(%u) failed\n",size);
+                KePrint("malloc(%u) failed\n",size);
                 IrqRestoreFlags(flags);
                 return NULL;
@@ -165 +166 @@
 
 /* FIXME! */
-        printf("free did not free %#X (from %#X)\n",p,__builtin_return_address(0));
+        KePrint("free did not free %#X (from %#X)\n",p,__builtin_return_address(0));
         cli(); hlt();
 }
@@ -326 +327 @@
         }
 
-        printf("MemCacheAlloc(%#X) - failed to allocate memory\n",cache);
+        KePrint("MemCacheAlloc(%#X) - failed to allocate memory\n",cache);
         IrqRestoreFlags(flags);
         /* Shouldn't get here, as all memory requests should be satifisted by adding slabs */
@@ -413 +414 @@
 SYMBOL_EXPORT(MemCacheCreate);
 
+DWORD functions[]=
+{
+        (DWORD)malloc,
+        (DWORD)free,
+        (DWORD)MemCacheCreate,
+        (DWORD)MemCacheAlloc,
+        (DWORD)MemCacheFree,
+};
+
 int SlabInit()
 {
@@ -418 +428 @@
 
         /* Set up the cache cache */
-        ListAdd(&cacheList,&cacheCache.list);
+        ListAdd(&cacheList, &cacheCache.list);
 
         /* Now start allocating caches */
@@ -430 +440 @@
                 if (!cacheSizes[i].cache)
                 {
-                        printf("Malloc slab allocation failed!\n");
+                        KePrint("Malloc slab allocation failed!\n");
                         return -ENOMEM;
                 }
         }
 
+        ResolveSetMemFunctions(functions);
+
         return 0;
 }
+
+ModuleInit(SlabInit);