Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored named shared memory handling into SharedMem class, with pl…
…atform-specific implementations for Windows and Linux (not OSX), removed toggle to enable named shared memory
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| MIT License | ||
| Copyright (c) 2022 PCSX-Redux authors | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. | ||
| */ | ||
|
|
||
| #ifdef __linux__ | ||
|
|
||
| #include "support/sharedmem.h" | ||
| #include "core/system.h" | ||
|
|
||
| #include <assert.h> | ||
|
|
||
| void PCSX::SharedMem::init(const char* name, size_t size) { | ||
| assert(m_mem == nullptr); | ||
| bool doRawAlloc = true; | ||
| // Try to create a shared memory mapping, if a name is provided | ||
| m_fd = shm_open(name, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); | ||
| if (m_fd < 0) { | ||
| g_system->message("shm_open failed, falling back to memory alloc, size: %zu\n", m_size); | ||
| } else { | ||
| // fd is ready, reserve the memory we need | ||
| int result = ftruncate(m_fd, static_cast<off_t>(size)); | ||
| if (result < 0) { | ||
| shm_unlink(name); | ||
| close(m_fd); | ||
| m_fd = -1; | ||
| g_system->message("ftruncate failed, falling back to memory alloc, size: %zu\n", m_size); | ||
| } else { | ||
| // ftruncate completed, now map the memory at 0 offset | ||
| void* basePointer = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, m_fd, 0); | ||
| // Validate success and assign the view to m_mem | ||
| if (basePointer != MAP_FAILED) { | ||
| doRawAlloc = false; | ||
| m_mem = static_cast<uint8_t *>(basePointer); | ||
| } else { | ||
| shm_unlink(name); | ||
| close(m_fd); | ||
| m_fd = -1; | ||
| g_system->message("mmap failed, falling back to memory alloc, size: %zu\n", m_size); | ||
| } | ||
| } | ||
| } | ||
| m_name = std::string(name); | ||
| m_size = size; | ||
| // Alloc memory directly if we opted out or had problems creating the memory map | ||
| if (doRawAlloc) { | ||
| m_mem = (uint8_t*)calloc(size, 1); | ||
| } | ||
| } | ||
|
Check warning on line 70 in src/support/sharedmem-linux.cc
|
||
|
|
||
| PCSX::SharedMem::~SharedMem() { | ||
| if (m_fd == -1) { | ||
| free(m_mem); | ||
| } else { | ||
| munmap(m_mem, m_size); | ||
| shm_unlink(m_name.c_str()); | ||
| close(m_fd); | ||
| } | ||
| } | ||
|
|
||
| #endif | ||
Oops, something went wrong.