Second Extended Filesystem (ext2) and other improvements (#33)

[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 04379e1dcf047ea3f6bf1e63a2c658ef7aba4487..67c8eacb3f43f45b8b68c421e72c5f157c33583e 100644 (file)
--- a/lunaix-os/kernel/mm/valloc.c
+++ b/lunaix-os/kernel/mm/valloc.c
@@ -5,13 +5,15 @@
 
 #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0]))
 
 
 #define CLASS_LEN(class) (sizeof(class) / sizeof(class[0]))
 

-static char piles_names[][PILE_NAME_MAXLEN] = {
+static char piles_names[][PILE_NAME_MAXLEN] = 
+{

     "valloc_8",   "valloc_16",  "valloc_32",  "valloc_64",
     "valloc_128", "valloc_256", "valloc_512", "valloc_1k",
     "valloc_8",   "valloc_16",  "valloc_32",  "valloc_64",
     "valloc_128", "valloc_256", "valloc_512", "valloc_1k",

-    "valloc_2k",  "valloc_4k",  "valloc_8k"
+    "valloc_2k",  "valloc_4k",  "valloc_8k"  

 };
 
 };
 

-static char piles_names_dma[][PILE_NAME_MAXLEN] = {
+static char piles_names_dma[][PILE_NAME_MAXLEN] = 
+{

     "valloc_dma_128", "valloc_dma_256", "valloc_dma_512",
     "valloc_dma_1k",  "valloc_dma_2k",  "valloc_dma_4k"
 };
     "valloc_dma_128", "valloc_dma_256", "valloc_dma_512",
     "valloc_dma_1k",  "valloc_dma_2k",  "valloc_dma_4k"
 };


@@ -24,14 +26,14 @@ 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 ? 8 : 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_ALIGN_CACHE);

     }
 }
 
     }
 }
 


@@ -41,12 +43,12 @@ __valloc(unsigned int size,
          size_t len,
          size_t boffset)
 {
          size_t len,
          size_t boffset)
 {

-    size_t i = ILOG2(size);
+    size_t i = ilog2(size);

     i += (size - (1 << i) != 0);
     i -= boffset;
 
     if (i >= len)
     i += (size - (1 << i) != 0);
     i -= boffset;
 
     if (i >= len)

-        return NULL;
+        i = 0;

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


@@ -65,13 +67,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), 3);
+    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), 3);
+    void* ptr = __valloc(size, piles, CLASS_LEN(piles_names), 3);

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


@@ -80,11 +82,11 @@ void*
 vcalloc(unsigned int size, unsigned int count)
 {
     unsigned int alloc_size;
 vcalloc(unsigned int size, unsigned int count)
 {
     unsigned int alloc_size;

-    if (__builtin_umul_overflow(size, count, &alloc_size)) {
+    if (umul_of(size, count, &alloc_size)) {

         return 0;
     }
 
         return 0;
     }
 

-    void* ptr = __valloc(alloc_size, &piles, CLASS_LEN(piles_names), 3);
+    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;
 }


@@ -92,19 +94,29 @@ 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
+vfree_safe(void* ptr)
+{
+    if (!ptr) {
+        return;
+    }
+
+    __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), 7);
+    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), 7);
+    void* ptr = __valloc(size, piles_dma, CLASS_LEN(piles_names_dma), 7);

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


@@ -112,5 +124,10 @@ 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));
+}
+
+inline void must_inline
+valloc_ensure_valid(void* ptr) {
+    cake_ensure_valid(ptr);

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