The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-27 06:24:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use small_vector for VMM TranslateRange results

Browse Source 
This was the source of a lot of heap allocs, moving to small_vector helps to avoid most of them
This commit is contained in:
Billy Laws 2022-07-31 13:11:57 +01:00
parent 1fe6d92970
commit b6b04fa6c5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/cpp/skyline/common/address_space.h
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <boost/container/small_vector.hpp>
#include <concepts> #include <concepts>
#include <common.h> #include <common.h>
@ -10,6 +11,8 @@ namespace skyline {
template<typename VaType, size_t AddressSpaceBits> template<typename VaType, size_t AddressSpaceBits>
concept AddressSpaceValid = std::is_unsigned_v<VaType> && sizeof(VaType) * 8 >= AddressSpaceBits; concept AddressSpaceValid = std::is_unsigned_v<VaType> && sizeof(VaType) * 8 >= AddressSpaceBits;
using TranslatedAddressRange = boost::container::small_vector<span<u8>, 1>;
struct EmptyStruct {}; struct EmptyStruct {};
/** /**
@ -116,7 +119,7 @@ namespace skyline {
/** /**
* @return A vector of all physical ranges inside of the given virtual range * @return A vector of all physical ranges inside of the given virtual range
*/ */
std::vector<span<u8>> TranslateRange(VaType virt, VaType size, std::function<void(span<u8>)> cpuAccessCallback = {}); TranslatedAddressRange TranslateRange(VaType virt, VaType size, std::function<void(span<u8>)> cpuAccessCallback = {});
void Read(u8 *destination, VaType virt, VaType size, std::function<void(span<u8>)> cpuAccessCallback = {}); void Read(u8 *destination, VaType virt, VaType size, std::function<void(span<u8>)> cpuAccessCallback = {});

4
app/src/main/cpp/skyline/common/address_space.inc
View File

@ -233,7 +233,7 @@ namespace skyline {
munmap(sparseMap, SparseMapSize); munmap(sparseMap, SparseMapSize);
} }
MM_MEMBER(std::vector<span<u8>>)::TranslateRange(VaType virt, VaType size, std::function<void(span<u8>)> cpuAccessCallback) { MM_MEMBER(TranslatedAddressRange)::TranslateRange(VaType virt, VaType size, std::function<void(span<u8>)> cpuAccessCallback) {
TRACE_EVENT("containers", "FlatMemoryManager::TranslateRange"); TRACE_EVENT("containers", "FlatMemoryManager::TranslateRange");
std::scoped_lock lock(this->blockMutex); std::scoped_lock lock(this->blockMutex);
@ -247,7 +247,7 @@ namespace skyline {
u8 *blockPhys{predecessor->phys + (virt - predecessor->virt)}; u8 *blockPhys{predecessor->phys + (virt - predecessor->virt)};
VaType blockSize{std::min(successor->virt - virt, size)}; VaType blockSize{std::min(successor->virt - virt, size)};
std::vector<span<u8>> ranges; TranslatedAddressRange ranges;
while (size) { while (size) {
// Return a zeroed out map to emulate sparse mappings // Return a zeroed out map to emulate sparse mappings