fix not freeing mirrored memory on Windows

src/os.cpp

@@ -16,6 +16,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
+#include <math.h>
 
 #if defined(_WIN32)
 #define SOUNDIO_OS_WINDOWS
@@ -131,6 +132,14 @@ pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static int page_size;
 
+struct SoundIoOsMirroredMemoryPrivate {
+    SoundIoOsMirroredMemory pub;
+#if defined(SOUNDIO_OS_WINDOWS)
+    HANDLE handle;
+#endif
+};
+
+
 double soundio_os_get_time(void) {
 #if defined(SOUNDIO_OS_WINDOWS)
     unsigned __int64 time;
@@ -603,19 +612,19 @@ int soundio_os_page_size(void) {
     return page_size;
 }
 
-int soundio_os_create_mirrored_memory(size_t *capacity, char **out_address) {
+struct SoundIoOsMirroredMemory *soundio_os_create_mirrored_memory(size_t requested_capacity) {
-    *out_address = nullptr;
+    SoundIoOsMirroredMemoryPrivate *m = create<SoundIoOsMirroredMemoryPrivate>();
-    size_t requested_capacity = *capacity;
+    if (!m)
+        return nullptr;
+    SoundIoOsMirroredMemory *mem = &m->pub;
 
-    size_t actual_capacity = (requested_capacity / page_size) * page_size;
+    size_t actual_capacity = ceil(requested_capacity / (double)page_size) * page_size;
-    if (actual_capacity < requested_capacity)
-        actual_capacity += page_size;
 
 #if defined(SOUNDIO_OS_WINDOWS)
     BOOL ok;
     HANDLE hMapFile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, actual_capacity * 2, NULL);
     if (!hMapFile)
-        return SoundIoErrorNoMem;
+        return nullptr;
 
     for (;;) {
         // find a free address space with the correct size
@@ -623,7 +632,7 @@ int soundio_os_create_mirrored_memory(size_t *capacity, char **out_address) {
         if (!address) {
             ok = CloseHandle(hMapFile);
             assert(ok);
-            return SoundIoErrorNoMem;
+            return nullptr;
         }
 
         // found a big enough address space. hopefully it will remain free
@@ -639,7 +648,7 @@ int soundio_os_create_mirrored_memory(size_t *capacity, char **out_address) {
             } else {
                 ok = CloseHandle(hMapFile);
                 assert(ok);
-                return SoundIoErrorNoMem;
+                return nullptr;
             }
         }
 
@@ -655,48 +664,56 @@ int soundio_os_create_mirrored_memory(size_t *capacity, char **out_address) {
             } else {
                 ok = CloseHandle(hMapFile);
                 assert(ok);
-                return SoundIoErrorNoMem;
+                return nullptr;
             }
         }
 
-        *out_address = address;
+        mem->address = address;
         break;
     }
 #else
     char *address = (char*)mmap(NULL, actual_capacity * 2, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
     if (address == MAP_FAILED)
-        return SoundIoErrorNoMem;
+        return nullptr;
 
     char *other_address = (char*)mmap(address, actual_capacity, PROT_READ|PROT_WRITE,
             MAP_ANONYMOUS|MAP_FIXED|MAP_SHARED, -1, 0);
     if (other_address != address) {
         munmap(address, 2 * actual_capacity);
-        return SoundIoErrorNoMem;
+        return nullptr;
     }
 
     other_address = (char*)mmap(address + actual_capacity, actual_capacity,
             PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_FIXED|MAP_SHARED, -1, 0);
     if (other_address != address + actual_capacity) {
         munmap(address, 2 * actual_capacity);
-        return SoundIoErrorNoMem;
+        return nullptr;
     }
 
-    *out_address = address;
+    mem->address = address;
 
 #endif
 
-    *capacity = actual_capacity;
+    mem->capacity = actual_capacity;
-
+    return mem;
-    return 0;
 }
 
-void soundio_os_destroy_mirrored_memory(char *address, size_t capacity) {
+void soundio_os_destroy_mirrored_memory(struct SoundIoOsMirroredMemory *mem) {
-    if (!address)
+    if (!mem)
+        return;
+    if (!mem->address)
         return;
 #if defined(SOUNDIO_OS_WINDOWS)
-    // TODO
+    SoundIoOsMirroredMemoryPrivate *m = (SoundIoOsMirroredMemoryPrivate *)mem;
+    BOOL ok;
+    ok = UnmapViewOfFile(mem->address);
+    assert(ok);
+    ok = UnmapViewOfFile(mem->address + mem->capacity);
+    assert(ok);
+    ok = CloseHandle(m->handle);
+    assert(ok);
 #else
-    int err = munmap(address, 2 * capacity);
+    int err = munmap(mem->address, 2 * mem->capacity);
     assert(!err);
 #endif
 }

src/os.hpp

@@ -51,11 +51,15 @@ void soundio_os_cond_wait(struct SoundIoOsCond *cond,
 
 int soundio_os_page_size(void);
 
-// capacity is replaced with actual capacity which might be modified to be
+// The size of this struct is not part of the API or ABI.
-// a multiple of the system page size
+struct SoundIoOsMirroredMemory {
-int soundio_os_create_mirrored_memory(size_t *capacity, char **out_address);
+    size_t capacity;
-// capacity should be the actual capacity value that was given via
+    char *address;
-// soundio_os_create_mirrored_memory
+};
-void soundio_os_destroy_mirrored_memory(char *address, size_t capacity);
+
+// returned capacity might be increased from capacity to be a multiple of the
+// system page size
+struct SoundIoOsMirroredMemory *soundio_os_create_mirrored_memory(size_t capacity);
+void soundio_os_destroy_mirrored_memory(struct SoundIoOsMirroredMemory *mem);
 
 #endif

src/ring_buffer.cpp

@@ -75,14 +75,13 @@ void soundio_ring_buffer_clear(struct SoundIoRingBuffer *rb) {
 }
 
 int soundio_ring_buffer_init(struct SoundIoRingBuffer *rb, int requested_capacity) {
-    int err;
+    rb->mem = soundio_os_create_mirrored_memory(requested_capacity);
-    size_t capacity = requested_capacity;
+    if (!rb->mem) {
-    if ((err = soundio_os_create_mirrored_memory(&capacity, &rb->address))) {
         soundio_ring_buffer_deinit(rb);
-        return err;
+        return SoundIoErrorNoMem;
     }
-
+    rb->address = rb->mem->address;
-    rb->capacity = capacity;
+    rb->capacity = rb->mem->capacity;
     rb->write_offset = 0;
     rb->read_offset = 0;
 
@@ -90,5 +89,6 @@ int soundio_ring_buffer_init(struct SoundIoRingBuffer *rb, int requested_capacit
 }
 
 void soundio_ring_buffer_deinit(struct SoundIoRingBuffer *rb) {
-    soundio_os_destroy_mirrored_memory(rb->address, rb->capacity);
+    soundio_os_destroy_mirrored_memory(rb->mem);
+    rb->mem = nullptr;
 }

src/ring_buffer.hpp

@@ -9,12 +9,14 @@
 #define SOUNDIO_RING_BUFFER_HPP
 
 #include "atomics.hpp"
+#include "os.hpp"
 
 struct SoundIoRingBuffer {
     char *address;
     int capacity;
     atomic_long write_offset;
     atomic_long read_offset;
+    SoundIoOsMirroredMemory *mem;
 };
 
 int soundio_ring_buffer_init(struct SoundIoRingBuffer *rb, int requested_capacity);