Harden Foundations memory and concurrency contracts

src/ElementalTools/Shaders/ShaderCompilerUtils.cpp

@@ -19,7 +19,9 @@ void WriteShaderData(Span<uint8_t> data, uint32_t* currentOffset, ReadOnlySpan<c
 {
     auto dataSpan = ReadOnlySpan<uint8_t>((uint8_t*)value.Pointer, value.Length);
     SystemCopyBuffer(data.Slice(*currentOffset), dataSpan);
-    *currentOffset += value.Length + 1;
+    *currentOffset += value.Length;
+    data[*currentOffset] = 0;
+    *currentOffset += 1;
 }
 
 template<typename T>
@@ -160,4 +162,4 @@ ReadOnlySpan<ShaderPart> ReadShaderParts(MemoryArena memoryArena, ReadOnlySpan<u
     }
 
     return shaderParts;
-}
+}

src/Foundations/Microsoft/SystemPlatformFunctions.cpp

@@ -63,31 +63,55 @@ size_t SystemPlatformGetPageSize()
 
 SystemPlatformAllocationInfos SystemPlatformGetAllocationInfos()
 {
-    return systemPlatformAllocationInfos;
+    SystemPlatformAllocationInfos result = {};
+    SystemAtomicLoad(systemPlatformAllocationInfos.CommittedBytes, result.CommittedBytes);
+    SystemAtomicLoad(systemPlatformAllocationInfos.ReservedBytes, result.ReservedBytes);
+    return result;
 }
 
 void* SystemPlatformReserveMemory(size_t sizeInBytes)
 {
-    systemPlatformAllocationInfos.ReservedBytes += sizeInBytes;
-    return VirtualAlloc2(nullptr, nullptr, sizeInBytes, MEM_RESERVE, PAGE_NOACCESS, nullptr, 0);
+    auto result = VirtualAlloc2(nullptr, nullptr, sizeInBytes, MEM_RESERVE, PAGE_NOACCESS, nullptr, 0);
+
+    if (result != nullptr)
+    {
+        SystemAtomicAdd(systemPlatformAllocationInfos.ReservedBytes, sizeInBytes);
+    }
+
+    return result;
 }
 
-void SystemPlatformFreeMemory(void* pointer, size_t sizeInBytes)
+void SystemPlatformFreeMemory(void* pointer, size_t sizeInBytes, size_t committedSizeInBytes)
 {
-    systemPlatformAllocationInfos.ReservedBytes -= sizeInBytes;
-    VirtualFree(pointer, 0, MEM_RELEASE);
+    if (VirtualFree(pointer, 0, MEM_RELEASE))
+    {
+        SystemAtomicSubstract(systemPlatformAllocationInfos.ReservedBytes, sizeInBytes);
+        SystemAtomicSubstract(systemPlatformAllocationInfos.CommittedBytes, committedSizeInBytes);
+    }
 }
 
-void SystemPlatformCommitMemory(void* pointer, size_t sizeInBytes)
+bool SystemPlatformCommitMemory(void* pointer, size_t sizeInBytes)
 {
-    systemPlatformAllocationInfos.CommittedBytes += sizeInBytes;
-    VirtualAlloc2(nullptr, pointer, sizeInBytes, MEM_COMMIT, PAGE_READWRITE, nullptr, 0);
+    auto result = VirtualAlloc2(nullptr, pointer, sizeInBytes, MEM_COMMIT, PAGE_READWRITE, nullptr, 0);
+
+    if (result == nullptr)
+    {
+        return false;
+    }
+
+    SystemAtomicAdd(systemPlatformAllocationInfos.CommittedBytes, sizeInBytes);
+    return true;
 }
 
-void SystemPlatformDecommitMemory(void* pointer, size_t sizeInBytes)
+bool SystemPlatformDecommitMemory(void* pointer, size_t sizeInBytes)
 {
-    systemPlatformAllocationInfos.CommittedBytes -= sizeInBytes;
-    VirtualFree(pointer, sizeInBytes, MEM_DECOMMIT);
+    if (!VirtualFree(pointer, sizeInBytes, MEM_DECOMMIT))
+    {
+        return false;
+    }
+
+    SystemAtomicSubstract(systemPlatformAllocationInfos.CommittedBytes, sizeInBytes);
+    return true;
 }
 
 void SystemPlatformClearMemory(void* pointer, size_t sizeInBytes)

src/Foundations/PosixPlatformFunctions.cpp

@@ -1,4 +1,5 @@
 #include "SystemPlatformFunctions.h"
+#include "SystemFunctions.h"
 
 #ifdef ElemAPI
 #include "SystemLogging.h"
@@ -76,31 +77,54 @@ size_t SystemPlatformGetPageSize()
 
 SystemPlatformAllocationInfos SystemPlatformGetAllocationInfos()
 {
-    return systemPlatformAllocationInfos;
+    SystemPlatformAllocationInfos result = {};
+    SystemAtomicLoad(systemPlatformAllocationInfos.CommittedBytes, result.CommittedBytes);
+    SystemAtomicLoad(systemPlatformAllocationInfos.ReservedBytes, result.ReservedBytes);
+    return result;
 }
 
 void* SystemPlatformReserveMemory(size_t sizeInBytes)
 {
-    systemPlatformAllocationInfos.ReservedBytes += sizeInBytes;
-    return mmap(nullptr, sizeInBytes, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
+    auto result = mmap(nullptr, sizeInBytes, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
+
+    if (result == MAP_FAILED)
+    {
+        return nullptr;
+    }
+
+    SystemAtomicAdd(systemPlatformAllocationInfos.ReservedBytes, sizeInBytes);
+    return result;
 }
 
-void SystemPlatformFreeMemory(void* pointer, size_t sizeInBytes)
+void SystemPlatformFreeMemory(void* pointer, size_t sizeInBytes, size_t committedSizeInBytes)
 {
-    systemPlatformAllocationInfos.ReservedBytes -= sizeInBytes;
-    munmap(pointer, sizeInBytes);
+    if (munmap(pointer, sizeInBytes) == 0)
+    {
+        SystemAtomicSubstract(systemPlatformAllocationInfos.ReservedBytes, sizeInBytes);
+        SystemAtomicSubstract(systemPlatformAllocationInfos.CommittedBytes, committedSizeInBytes);
+    }
 }
 
-void SystemPlatformCommitMemory(void* pointer, size_t sizeInBytes)
+bool SystemPlatformCommitMemory(void* pointer, size_t sizeInBytes)
 {
-    systemPlatformAllocationInfos.CommittedBytes += sizeInBytes;
-    mprotect(pointer, sizeInBytes, PROT_READ | PROT_WRITE);
+    if (mprotect(pointer, sizeInBytes, PROT_READ | PROT_WRITE) != 0)
+    {
+        return false;
+    }
+
+    SystemAtomicAdd(systemPlatformAllocationInfos.CommittedBytes, sizeInBytes);
+    return true;
 }
 
-void SystemPlatformDecommitMemory(void* pointer, size_t sizeInBytes)
+bool SystemPlatformDecommitMemory(void* pointer, size_t sizeInBytes)
 {
-    systemPlatformAllocationInfos.CommittedBytes -= sizeInBytes;
-    mprotect(pointer, sizeInBytes, PROT_NONE);
+    if (mprotect(pointer, sizeInBytes, PROT_NONE) != 0)
+    {
+        return false;
+    }
+
+    SystemAtomicSubstract(systemPlatformAllocationInfos.CommittedBytes, sizeInBytes);
+    return true;
 }
 
 void SystemPlatformClearMemory(void* pointer, size_t sizeInBytes)
@@ -144,7 +168,7 @@ void SystemPlatformFileWriteBytes(ReadOnlySpan<char> path, ReadOnlySpan<uint8_t>
 
     if (write(fileHandle, data.Pointer, data.Length) < 0) 
     {
-        SystemLogErrorMessage(ElemLogMessageCategory_Application, "Error writing to file %s.", path.Pointer);
+        SystemLogErrorMessage(ElemLogMessageCategory_Application, "Error writing file %s.", path.Pointer);
     }
 
     close(fileHandle);