WIP thread safe linked list

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86_64/src/memory/heap/linked_list_allocator.cpp b/arch/x86_64/src/memory/heap/linked_list_allocator.cpp
index f596f27..22b5757 100644
--- a/arch/x86_64/src/memory/heap/linked_list_allocator.cpp
+++ b/arch/x86_64/src/memory/heap/linked_list_allocator.cpp
@@ -28,7 +28,7 @@ namespace teachos::arch::memory::heap
                                "[Linked List Allocator] Allocated memory cannot be smaller than 16 bytes");
 
     memory_block * previous = nullptr;
-    auto current = first;
+    auto current = first.load(std::memory_order::relaxed);
 
     while (current != nullptr)
     {
@@ -52,7 +52,7 @@ namespace teachos::arch::memory::heap
     auto const end_address = start_address + size;
 
     memory_block * previous = nullptr;
-    auto current = first;
+    auto current = first.load(std::memory_order::relaxed);
 
     while (current != nullptr)
     {
@@ -81,11 +81,11 @@ namespace teachos::arch::memory::heap
     // free block (nullptr). Therefore we have to overwrite the first block instead of overwriting its next value.
     if (previous_block == nullptr)
     {
-      first = new_block;
+      first.compare_exchange_weak(previous_block, new_block, std::memory_order::relaxed);
     }
     else
     {
-      previous_block->next = new_block;
+      previous_block->next.compare_exchange_weak(current_block, new_block, std::memory_order::relaxed);
     }
     clear_memory_block_header(current_block);
     return reinterpret_cast<void *>(start_address);