From 812cc8b6322fa72982a3084bb3de4bdb564331fe Mon Sep 17 00:00:00 2001
From: "Admiral H. Curtiss" <pikachu025@gmail.com>
Date: Mon, 21 Jun 2021 01:17:07 +0200
Subject: MemArena: Split into three separate files for each OS.

---
 Source/Core/Common/MemArenaUnix.cpp | 83 +++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 Source/Core/Common/MemArenaUnix.cpp

(limited to 'Source/Core/Common/MemArenaUnix.cpp')

diff --git a/Source/Core/Common/MemArenaUnix.cpp b/Source/Core/Common/MemArenaUnix.cpp
new file mode 100644
index 0000000000..63465a5e22
--- /dev/null
+++ b/Source/Core/Common/MemArenaUnix.cpp
@@ -0,0 +1,83 @@
+// Copyright 2008 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Common/MemArena.h"
+
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <set>
+#include <string>
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
+#include "Common/StringUtil.h"
+
+namespace Common
+{
+void MemArena::GrabSHMSegment(size_t size)
+{
+  const std::string file_name = "/dolphin-emu." + std::to_string(getpid());
+  fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
+  if (fd == -1)
+  {
+    ERROR_LOG_FMT(MEMMAP, "shm_open failed: {}", strerror(errno));
+    return;
+  }
+  shm_unlink(file_name.c_str());
+  if (ftruncate(fd, size) < 0)
+    ERROR_LOG_FMT(MEMMAP, "Failed to allocate low memory space");
+}
+
+void MemArena::ReleaseSHMSegment()
+{
+  close(fd);
+}
+
+void* MemArena::CreateView(s64 offset, size_t size, void* base)
+{
+  void* retval = mmap(base, size, PROT_READ | PROT_WRITE,
+                      MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED), fd, offset);
+
+  if (retval == MAP_FAILED)
+  {
+    NOTICE_LOG_FMT(MEMMAP, "mmap failed");
+    return nullptr;
+  }
+  else
+  {
+    return retval;
+  }
+}
+
+void MemArena::ReleaseView(void* view, size_t size)
+{
+  munmap(view, size);
+}
+
+u8* MemArena::FindMemoryBase()
+{
+#if _ARCH_32
+  const size_t memory_size = 0x31000000;
+#else
+  const size_t memory_size = 0x400000000;
+#endif
+
+  const int flags = MAP_ANON | MAP_PRIVATE;
+  void* base = mmap(nullptr, memory_size, PROT_NONE, flags, -1, 0);
+  if (base == MAP_FAILED)
+  {
+    PanicAlertFmt("Failed to map enough memory space: {}", LastStrerrorString());
+    return nullptr;
+  }
+  munmap(base, memory_size);
+  return static_cast<u8*>(base);
+}
+}  // namespace Common
-- 
cgit v1.2.3


From 155412856072c07521536d5a07117c400c0ce131 Mon Sep 17 00:00:00 2001
From: "Admiral H. Curtiss" <pikachu025@gmail.com>
Date: Mon, 21 Jun 2021 02:13:00 +0200
Subject: MemArena: Prepare interface for proper memory reservation.

---
 Source/Core/Common/MemArenaUnix.cpp | 53 ++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 21 deletions(-)

(limited to 'Source/Core/Common/MemArenaUnix.cpp')

diff --git a/Source/Core/Common/MemArenaUnix.cpp b/Source/Core/Common/MemArenaUnix.cpp
index 63465a5e22..1743c2ace0 100644
--- a/Source/Core/Common/MemArenaUnix.cpp
+++ b/Source/Core/Common/MemArenaUnix.cpp
@@ -22,6 +22,9 @@
 
 namespace Common
 {
+MemArena::MemArena() = default;
+MemArena::~MemArena() = default;
+
 void MemArena::GrabSHMSegment(size_t size)
 {
   const std::string file_name = "/dolphin-emu." + std::to_string(getpid());
@@ -41,35 +44,18 @@ void MemArena::ReleaseSHMSegment()
   close(fd);
 }
 
-void* MemArena::CreateView(s64 offset, size_t size, void* base)
+void* MemArena::CreateView(s64 offset, size_t size)
 {
-  void* retval = mmap(base, size, PROT_READ | PROT_WRITE,
-                      MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED), fd, offset);
-
-  if (retval == MAP_FAILED)
-  {
-    NOTICE_LOG_FMT(MEMMAP, "mmap failed");
-    return nullptr;
-  }
-  else
-  {
-    return retval;
-  }
+  return MapInMemoryRegion(offset, size, nullptr);
 }
 
 void MemArena::ReleaseView(void* view, size_t size)
 {
-  munmap(view, size);
+  UnmapFromMemoryRegion(view, size);
 }
 
-u8* MemArena::FindMemoryBase()
+u8* MemArena::ReserveMemoryRegion(size_t memory_size)
 {
-#if _ARCH_32
-  const size_t memory_size = 0x31000000;
-#else
-  const size_t memory_size = 0x400000000;
-#endif
-
   const int flags = MAP_ANON | MAP_PRIVATE;
   void* base = mmap(nullptr, memory_size, PROT_NONE, flags, -1, 0);
   if (base == MAP_FAILED)
@@ -80,4 +66,29 @@ u8* MemArena::FindMemoryBase()
   munmap(base, memory_size);
   return static_cast<u8*>(base);
 }
+
+void MemArena::ReleaseMemoryRegion()
+{
+}
+
+void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
+{
+  void* retval = mmap(base, size, PROT_READ | PROT_WRITE,
+                      MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED), fd, offset);
+
+  if (retval == MAP_FAILED)
+  {
+    NOTICE_LOG_FMT(MEMMAP, "mmap failed");
+    return nullptr;
+  }
+  else
+  {
+    return retval;
+  }
+}
+
+void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
+{
+  munmap(view, size);
+}
 }  // namespace Common
-- 
cgit v1.2.3