mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-16 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve low-level mmap utilities (Linux/BSD)

Browse Source 
Add madvise (MADV_WILLNEED) on utils::memory_commit
Add madvise (MADV_FREE or MADV_DONTNEED) on utils::memory_decommit
Improve shm_open pseudo-random name (not used on Linux)
This commit is contained in:
Nekotekina 2020-11-04 14:56:40 +03:00
parent ba5ed5f380
commit b66628baca
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/JIT.cpp
View File

@ -88,9 +88,7 @@ static u8* add_jit_memory(std::size_t size, uint align)
if (olda != newa) [[unlikely]] if (olda != newa) [[unlikely]]
{ {
#ifdef CAN_OVERCOMMIT #ifndef CAN_OVERCOMMIT
madvise(pointer + olda, newa - olda, MADV_WILLNEED);
#else
// Commit more memory // Commit more memory
utils::memory_commit(pointer + olda, newa - olda, Prot); utils::memory_commit(pointer + olda, newa - olda, Prot);
#endif #endif

20
Utilities/VirtualMemory.cpp
View File

@ -112,6 +112,7 @@ namespace utils
#else #else
const u64 ptr64 = reinterpret_cast<u64>(pointer); const u64 ptr64 = reinterpret_cast<u64>(pointer);
verify(HERE), ::mprotect(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), +prot) != -1; verify(HERE), ::mprotect(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), +prot) != -1;
verify(HERE), ::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1;
#endif #endif
} }
@ -120,7 +121,13 @@ namespace utils
#ifdef _WIN32 #ifdef _WIN32
verify(HERE), ::VirtualFree(pointer, size, MEM_DECOMMIT); verify(HERE), ::VirtualFree(pointer, size, MEM_DECOMMIT);
#else #else
const u64 ptr64 = reinterpret_cast<u64>(pointer);
verify(HERE), ::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(-1); verify(HERE), ::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(-1);
#ifdef MADV_FREE
verify(HERE), ::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_FREE) != -1;
#else
verify(HERE), ::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_DONTNEED) != -1;
#endif
#endif #endif
} }
@ -130,7 +137,14 @@ namespace utils
memory_decommit(pointer, size); memory_decommit(pointer, size);
memory_commit(pointer, size, prot); memory_commit(pointer, size, prot);
#else #else
const u64 ptr64 = reinterpret_cast<u64>(pointer);
#ifdef MADV_FREE
verify(HERE), ::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_FREE) != -1;
#else
verify(HERE), ::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_DONTNEED) != -1;
#endif
verify(HERE), ::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(-1); verify(HERE), ::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(-1);
verify(HERE), ::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1;
#endif #endif
} }
@ -178,7 +192,9 @@ namespace utils
verify(HERE), m_file >= 0; verify(HERE), m_file >= 0;
verify(HERE), ::ftruncate(m_file, m_size) >= 0; verify(HERE), ::ftruncate(m_file, m_size) >= 0;
#else #else
while ((m_file = ::shm_open("/rpcs3-mem1", O_RDWR | O_CREAT | O_EXCL, S_IWUSR | S_IRUSR)) == -1) const std::string name = "/rpcs3-mem-" + std::to_string(reinterpret_cast<u64>(this));
while ((m_file = ::shm_open(name.c_str(), O_RDWR | O_CREAT | O_EXCL, S_IWUSR | S_IRUSR)) == -1)
{ {
if (errno == EMFILE) if (errno == EMFILE)
{ {
@ -188,7 +204,7 @@ namespace utils
verify(HERE), errno == EEXIST; verify(HERE), errno == EEXIST;
} }
verify(HERE), ::shm_unlink("/rpcs3-mem1") >= 0; verify(HERE), ::shm_unlink(name.c_str()) >= 0;
verify(HERE), ::ftruncate(m_file, m_size) >= 0; verify(HERE), ::ftruncate(m_file, m_size) >= 0;
#endif #endif
} }