feat: a pseudo shell environment for basic interacting and testing purpose

[lunaix-os.git] / lunaix-os / kernel / mm / valloc.c

diff --git a/lunaix-os/kernel/mm/valloc.c b/lunaix-os/kernel/mm/valloc.c
index 5191a1af04ab889bcb851baaa295bf512fbff96c..a744ed1aeb091ac94f0f7562eb02cb27925fbc07 100644 (file)
--- a/lunaix-os/kernel/mm/valloc.c
+++ b/lunaix-os/kernel/mm/valloc.c
@@ -1,12 +1,14 @@
 #include <klibc/string.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 #include <klibc/string.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>

+#include <lunaix/spike.h>

 
 #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0]))
 
 static char piles_names[][PILE_NAME_MAXLEN] = {
 
 #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0]))
 
 static char piles_names[][PILE_NAME_MAXLEN] = {

-    "valloc_8",   "valloc_16",  "valloc_32", "valloc_64", "valloc_128",
-    "valloc_256", "valloc_512", "valloc_1k", "valloc_2k", "valloc_4k"
+    "valloc_8",   "valloc_16",  "valloc_32",  "valloc_64",
+    "valloc_128", "valloc_256", "valloc_512", "valloc_1k",
+    "valloc_2k",  "valloc_4k",  "valloc_8k"

 };
 
 static char piles_names_dma[][PILE_NAME_MAXLEN] = {
 };
 
 static char piles_names_dma[][PILE_NAME_MAXLEN] = {


@@ -22,30 +24,30 @@ valloc_init()
 {
     for (size_t i = 0; i < CLASS_LEN(piles_names); i++) {
         int size = 1 << (i + 3);
 {
     for (size_t i = 0; i < CLASS_LEN(piles_names); i++) {
         int size = 1 << (i + 3);

-        piles[i] = cake_new_pile(&piles_names[i], size, size > 1024 ? 4 : 1, 0);
+        piles[i] = cake_new_pile(piles_names[i], size, size > 1024 ? 8 : 1, 0);

     }
 
     // DMA 内存保证128字节对齐
     for (size_t i = 0; i < CLASS_LEN(piles_names_dma); i++) {
         int size = 1 << (i + 7);
         piles_dma[i] = cake_new_pile(
     }
 
     // DMA 内存保证128字节对齐
     for (size_t i = 0; i < CLASS_LEN(piles_names_dma); i++) {
         int size = 1 << (i + 7);
         piles_dma[i] = cake_new_pile(

-          &piles_names_dma[i], size, size > 1024 ? 4 : 1, PILE_CACHELINE);
+          piles_names_dma[i], size, size > 1024 ? 4 : 1, PILE_CACHELINE);

     }
 }
 
 void*
     }
 }
 
 void*

-__valloc(unsigned int size, struct cake_pile** segregate_list, size_t len)
+__valloc(unsigned int size,
+         struct cake_pile** segregate_list,
+         size_t len,
+         size_t boffset)

 {
 {

-    size_t i = 0;
-    for (; i < len; i++) {
-        if (segregate_list[i]->piece_size >= size) {
-            goto found_class;
-        }
-    }
+    size_t i = ILOG2(size);
+    i += (size - (1 << i) != 0);
+    i -= boffset;

 
 

-    return NULL;
+    if (i >= len)
+        return NULL;

 
 

-found_class:

     return cake_grab(segregate_list[i]);
 }
 
     return cake_grab(segregate_list[i]);
 }
 


@@ -63,13 +65,13 @@ __vfree(void* ptr, struct cake_pile** segregate_list, size_t len)
 void*
 valloc(unsigned int size)
 {
 void*
 valloc(unsigned int size)
 {

-    return __valloc(size, &piles, CLASS_LEN(piles_names));
+    return __valloc(size, piles, CLASS_LEN(piles_names), 3);

 }
 
 void*
 vzalloc(unsigned int size)
 {
 }
 
 void*
 vzalloc(unsigned int size)
 {

-    void* ptr = __valloc(size, &piles, CLASS_LEN(piles_names));
+    void* ptr = __valloc(size, piles, CLASS_LEN(piles_names), 3);

     memset(ptr, 0, size);
     return ptr;
 }
     memset(ptr, 0, size);
     return ptr;
 }


@@ -82,7 +84,7 @@ vcalloc(unsigned int size, unsigned int count)
         return 0;
     }
 
         return 0;
     }
 

-    void* ptr = __valloc(alloc_size, &piles, CLASS_LEN(piles_names));
+    void* ptr = __valloc(alloc_size, piles, CLASS_LEN(piles_names), 3);

     memset(ptr, 0, alloc_size);
     return ptr;
 }
     memset(ptr, 0, alloc_size);
     return ptr;
 }


@@ -90,19 +92,19 @@ vcalloc(unsigned int size, unsigned int count)
 void
 vfree(void* ptr)
 {
 void
 vfree(void* ptr)
 {

-    __vfree(ptr, &piles, CLASS_LEN(piles_names));
+    __vfree(ptr, piles, CLASS_LEN(piles_names));

 }
 
 void*
 valloc_dma(unsigned int size)
 {
 }
 
 void*
 valloc_dma(unsigned int size)
 {

-    return __valloc(size, &piles_dma, CLASS_LEN(piles_names_dma));
+    return __valloc(size, piles_dma, CLASS_LEN(piles_names_dma), 7);

 }
 
 void*
 vzalloc_dma(unsigned int size)
 {
 }
 
 void*
 vzalloc_dma(unsigned int size)
 {

-    void* ptr = __valloc(size, &piles_dma, CLASS_LEN(piles_names_dma));
+    void* ptr = __valloc(size, piles_dma, CLASS_LEN(piles_names_dma), 7);

     memset(ptr, 0, size);
     return ptr;
 }
     memset(ptr, 0, size);
     return ptr;
 }


@@ -110,5 +112,5 @@ vzalloc_dma(unsigned int size)
 void
 vfree_dma(void* ptr)
 {
 void
 vfree_dma(void* ptr)
 {

-    __vfree(ptr, &piles_dma, CLASS_LEN(piles_names_dma));
+    __vfree(ptr, piles_dma, CLASS_LEN(piles_names_dma));

 }
\ No newline at end of file
 }
\ No newline at end of file