Support to multi-threading and pthread interface (POSIX.1-2008) (#23)

[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 a744ed1aeb091ac94f0f7562eb02cb27925fbc07..113b7c659c15c0a72f8e6889be9c54dab00ae53f 100644 (file)
--- a/lunaix-os/kernel/mm/valloc.c
+++ b/lunaix-os/kernel/mm/valloc.c
@@ -5,16 +5,24 @@
 
 #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] = {
-    "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] = {
-    "valloc_dma_128", "valloc_dma_256", "valloc_dma_512",
-    "valloc_dma_1k",  "valloc_dma_2k",  "valloc_dma_4k"
-};
+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_8k"};
+
+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"};

 
 static struct cake_pile* piles[CLASS_LEN(piles_names)];
 static struct cake_pile* piles_dma[CLASS_LEN(piles_names_dma)];
 
 static struct cake_pile* piles[CLASS_LEN(piles_names)];
 static struct cake_pile* piles_dma[CLASS_LEN(piles_names_dma)];


@@ -31,7 +39,7 @@ valloc_init()
     for (size_t i = 0; i < CLASS_LEN(piles_names_dma); i++) {
         int size = 1 << (i + 7);
         piles_dma[i] = cake_new_pile(
     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);

     }
 }
 
     }
 }
 


@@ -46,7 +54,7 @@ __valloc(unsigned int size,
     i -= boffset;
 
     if (i >= len)
     i -= boffset;
 
     if (i >= len)

-        return NULL;
+        i = 0;

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


@@ -80,7 +88,7 @@ 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_overflow(size, count, &alloc_size)) {

         return 0;
     }
 
         return 0;
     }
 


@@ -95,6 +103,16 @@ 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)
 {


@@ -113,4 +131,9 @@ void
 vfree_dma(void* ptr)
 {
     __vfree(ptr, piles_dma, CLASS_LEN(piles_names_dma));
 vfree_dma(void* ptr)
 {
     __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