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

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

diff --git a/lunaix-os/kernel/mm/dmm.c b/lunaix-os/kernel/mm/dmm.c
index 04a024919a0a9e5104b210956064eff024151d5e..a76b9de979dd8e93ad68c6e9a24fdc7e7a571664 100644 (file)
--- a/lunaix-os/kernel/mm/dmm.c
+++ b/lunaix-os/kernel/mm/dmm.c
@@ -1,19 +1,62 @@
-#include <lunaix/mm/dmm.h>
+#include <lunaix/mm/mmap.h>

 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/vmm.h>

+#include <lunaix/process.h>
+#include <lunaix/status.h>
+
+#include <lunaix/spike.h>
+#include <lunaix/syscall.h>
+#include <lunaix/syscall_utils.h>

 
 

-// This is a temporary design. 
-//  We can do better when we are ready for multitasking

 void
 void

-lxsbrk(void* current, void* next) {
-    // TODO: sbrk 
+__heap_copied(struct mm_region* region)
+{
+    mm_index((void**)&region->proc_vms->heap, region);

 }
 
 }
 

-void
-lxmalloc(size_t size) {
-    // TODO: Malloc 
+int
+create_heap(struct proc_mm* pvms, ptr_t addr)
+{
+    struct mmap_param map_param = { .pvms = pvms,
+                                    .vms_mnt = VMS_SELF,
+                                    .flags = MAP_ANON | MAP_PRIVATE,
+                                    .type = REGION_TYPE_HEAP,
+                                    .proct = PROT_READ | PROT_WRITE,
+                                    .mlen = PG_SIZE };
+    int status = 0;
+    struct mm_region* heap;
+    if ((status = mmap_user(NULL, &heap, addr, NULL, &map_param))) {
+        return status;
+    }
+
+    heap->region_copied = __heap_copied;
+    mm_index((void**)&pvms->heap, heap);
+
+    return status;

 }
 
 }
 

-void
-lxfree(size_t size) {
-    // TODO: Free 
+__DEFINE_LXSYSCALL1(void*, sbrk, ssize_t, incr)
+{
+    struct proc_mm* pvms = vmspace(__current);
+    struct mm_region* heap = pvms->heap;
+
+    assert(heap);
+    int err = mem_adjust_inplace(&pvms->regions, heap, heap->end + incr);
+    if (err) {
+        return (void*)DO_STATUS(err);
+    }
+    return (void*)heap->end;
+}
+
+__DEFINE_LXSYSCALL1(int, brk, void*, addr)
+{
+    struct proc_mm* pvms = vmspace(__current);
+    struct mm_region* heap = pvms->heap;
+
+    if (!heap) {
+        return DO_STATUS(create_heap(pvms, (ptr_t)addr));
+    }
+
+    assert(heap);
+    int err = mem_adjust_inplace(&pvms->regions, heap, (ptr_t)addr);
+    return DO_STATUS(err);

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