DataHearth/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parcel: Optimize small_vector sizes

Browse Source
This commit is contained in:
Morph 2023-06-30 21:50:44 -04:00
parent 5a09fa5012
commit 1a46823ec5
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/hle/service/nvnflinger/parcel.h
View File

@ -6,6 +6,7 @@
#include <memory> #include <memory>
#include <span> #include <span>
#include <vector> #include <vector>
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
#include "common/alignment.h" #include "common/alignment.h"
@ -148,9 +149,9 @@ public:
this->WriteImpl(0U, m_object_buffer); this->WriteImpl(0U, m_object_buffer);
} }
std::vector<u8> Serialize() const { std::span<u8> Serialize() {
std::vector<u8> output_buffer(sizeof(ParcelHeader) + m_data_buffer.size() + m_output_buffer.resize(sizeof(ParcelHeader) + m_data_buffer.size() +
m_object_buffer.size()); m_object_buffer.size());
ParcelHeader header{}; ParcelHeader header{};
header.data_size = static_cast<u32>(m_data_buffer.size()); header.data_size = static_cast<u32>(m_data_buffer.size());
@ -158,17 +159,17 @@ public:
header.objects_size = static_cast<u32>(m_object_buffer.size()); header.objects_size = static_cast<u32>(m_object_buffer.size());
header.objects_offset = header.data_offset + header.data_size; header.objects_offset = header.data_offset + header.data_size;
std::memcpy(output_buffer.data(), &header, sizeof(header)); std::memcpy(m_output_buffer.data(), &header, sizeof(ParcelHeader));
std::ranges::copy(m_data_buffer, output_buffer.data() + header.data_offset); std::ranges::copy(m_data_buffer, m_output_buffer.data() + header.data_offset);
std::ranges::copy(m_object_buffer, output_buffer.data() + header.objects_offset); std::ranges::copy(m_object_buffer, m_output_buffer.data() + header.objects_offset);
return output_buffer; return m_output_buffer;
} }
private: private:
template <typename T> template <typename T, size_t BufferSize>
requires(std::is_trivially_copyable_v<T>) requires(std::is_trivially_copyable_v<T>)
void WriteImpl(const T& val, boost::container::small_vector<u8, 0x200>& buffer) { void WriteImpl(const T& val, boost::container::small_vector<u8, BufferSize>& buffer) {
const size_t aligned_size = Common::AlignUp(sizeof(T), 4); const size_t aligned_size = Common::AlignUp(sizeof(T), 4);
const size_t old_size = buffer.size(); const size_t old_size = buffer.size();
buffer.resize(old_size + aligned_size); buffer.resize(old_size + aligned_size);
@ -177,8 +178,9 @@ private:
} }
private: private:
boost::container::small_vector<u8, 0x200> m_data_buffer; boost::container::small_vector<u8, 0x1B0> m_data_buffer;
boost::container::small_vector<u8, 0x200> m_object_buffer; boost::container::small_vector<u8, 0x40> m_object_buffer;
boost::container::small_vector<u8, 0x200> m_output_buffer;
}; };
} // namespace Service::android } // namespace Service::android