Made the logger basically standalone

log/Log.h

@@ -12,11 +12,13 @@
 #include <stdio.h>
 #include <string.h>
 
-// @todo Make this file not rely on any other header except Types.
-
 #include "../stdlib/Types.h"
-#include "../platform/win32/UtilsWin32.h"
+#include "../utils/TestUtils.h"
-#include "../memory/RingMemory.h"
+#include "../utils/MathUtils.h"
+
+#ifdef _WIN32
+    #include <windows.h>
+#endif
 
 #ifndef LOG_LEVEL
     #define LOG_LEVEL 0
@@ -38,23 +40,73 @@ enum LogDataType {
     LOG_DATA_FLOAT64
 };
 
-void log_to_file(RingMemory* logs, HANDLE fp)
+struct LogMemory {
+    byte* memory;
+
+    uint32 id;
+    uint64 size;
+    uint64 pos;
+    int alignment;
+
+    uint64 start;
+    uint64 end;
+};
+
+byte* log_get_memory(LogMemory* ring, uint64 size, byte aligned = 1, bool zeroed = false)
 {
+    ASSERT_SIMPLE(size <= ring->size);
+
+    if (aligned > 1) {
+        uintptr_t address = (uintptr_t) ring->memory;
+        int64 adjustment = (aligned - ((address + ring->pos) & (aligned - 1))) % aligned;
+
+        ring->pos += adjustment;
+    }
+
+    size = ROUND_TO_NEAREST(size, aligned);
+    if (ring->pos + size > ring->size) {
+        ring->pos = 0;
+
+        if (aligned > 1) {
+            uintptr_t address = (uintptr_t) ring->memory;
+            int64 adjustment = (aligned - ((address + ring->pos) & (aligned - 1))) % aligned;
+
+            ring->pos += adjustment;
+        }
+    }
+
+    byte* offset = (byte *) (ring->memory + ring->pos);
+    if (zeroed) {
+        memset((void *) offset, 0, size);
+    }
+
+    ring->pos += size;
+
+    return offset;
+}
+
+#ifdef _WIN32
+    void log_to_file(LogMemory* logs, HANDLE fp)
+    {
         // we don't log an empty log pool
-    if (logs->pos == 0 || !fp) {
+        if (logs->pos == 0 || !fp || fp == INVALID_HANDLE_VALUE) {
             return;
         }
 
-    file_append(fp, (char *) logs->memory, logs->pos - 1);
+        DWORD written;
+        if (!WriteFile(fp, (char *) logs->memory, (uint32) logs->pos - 1, &written, NULL)) {
+            CloseHandle(fp);
+        }
+
         memset(logs->memory, 0, logs->size);
 
         // reset log position to start of memory pool
         logs->pos = 0;
         logs->start = 0;
-}
+    }
 
-void log(RingMemory* logs, const char* str, HANDLE fp = NULL, bool should_log = true, bool save = false)
+    void log(LogMemory* logs, const char* str, HANDLE fp = NULL, bool should_log = true, bool save = false)
-{
+    {
         if (!should_log) {
             return;
         }
@@ -62,17 +114,17 @@ void log(RingMemory* logs, const char* str, HANDLE fp = NULL, bool should_log =
         size_t length = strlen(str);
         ASSERT_SIMPLE(length < MAX_LOG_LENGTH);
 
-    char* temp = (char *) ring_get_memory(logs, length + 1);
+        char* temp = (char *) log_get_memory(logs, length + 1);
         strcpy(temp, str);
         temp[length] = '\0';
 
         if (fp != NULL && (save || logs->size - logs->pos < MAX_LOG_LENGTH)) {
             log_to_file(logs, fp);
         }
-}
+    }
 
-void log(RingMemory* logs, const char* format, LogDataType data_type, void* data, HANDLE fp = NULL, bool should_log = true, bool save = false)
+    void log(LogMemory* logs, const char* format, LogDataType data_type, void* data, HANDLE fp = NULL, bool should_log = true, bool save = false)
-{
+    {
         if (!should_log) {
             return;
         }
@@ -81,7 +133,7 @@ void log(RingMemory* logs, const char* format, LogDataType data_type, void* data
             log(logs, format, fp, true);
         }
 
-    char* temp = (char *) ring_get_memory(logs, MAX_LOG_LENGTH);
+        char* temp = (char *) log_get_memory(logs, MAX_LOG_LENGTH);
 
         switch (data_type) {
             case LOG_DATA_INT32: {
@@ -113,7 +165,8 @@ void log(RingMemory* logs, const char* format, LogDataType data_type, void* data
         if (fp != NULL && (save || logs->size - logs->pos < MAX_LOG_LENGTH)) {
             log_to_file(logs, fp);
         }
-}
+    }
+#endif
 
 #if (LOG_LEVEL == 0)
     // Don't perform any logging at log level 0

platform/win32/UtilsWin32.h

@@ -339,8 +339,7 @@ HANDLE get_append_handle(const char* path)
     return fp;
 }
 
-inline bool
+bool file_append(const char* path, const char* file)
-file_append(const char* path, const char* file)
 {
     HANDLE fp;
     if (*path == '.') {