midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_sys: std::move the vector in NCCHFile's constructor

Browse Source 
Avoids making unnecessary copies of the source vector's data.
This commit is contained in:
Lioncash 2017-12-09 14:18:31 -05:00
parent 370d77f13a
commit 11705857cd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/file_sys/archive_ncch.cpp
View File

@ -5,6 +5,7 @@
#include <algorithm> #include <algorithm>
#include <cinttypes> #include <cinttypes>
#include <memory> #include <memory>
#include <utility>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
@ -83,7 +84,7 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
// Load NCCH .code or icon/banner/logo // Load NCCH .code or icon/banner/logo
result = ncch_container.LoadSectionExeFS(openfile_path.exefs_filepath.data(), buffer); result = ncch_container.LoadSectionExeFS(openfile_path.exefs_filepath.data(), buffer);
file = std::make_unique<NCCHFile>(buffer); file = std::make_unique<NCCHFile>(std::move(buffer));
} else { } else {
LOG_ERROR(Service_FS, "Unknown NCCH archive type %u!", openfile_path.filepath_type); LOG_ERROR(Service_FS, "Unknown NCCH archive type %u!", openfile_path.filepath_type);
result = Loader::ResultStatus::Error; result = Loader::ResultStatus::Error;
@ -193,6 +194,8 @@ u64 NCCHArchive::GetFreeBytes() const {
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
NCCHFile::NCCHFile(std::vector<u8> buffer) : file_buffer(std::move(buffer)) {}
ResultVal<size_t> NCCHFile::Read(const u64 offset, const size_t length, u8* buffer) const { ResultVal<size_t> NCCHFile::Read(const u64 offset, const size_t length, u8* buffer) const {
LOG_TRACE(Service_FS, "called offset=%" PRIu64 ", length=%zu", offset, length); LOG_TRACE(Service_FS, "called offset=%" PRIu64 ", length=%zu", offset, length);
size_t length_left = static_cast<size_t>(data_size - offset); size_t length_left = static_cast<size_t>(data_size - offset);

2
src/core/file_sys/archive_ncch.h
View File

@ -51,7 +51,7 @@ protected:
// File backend for NCCH files // File backend for NCCH files
class NCCHFile : public FileBackend { class NCCHFile : public FileBackend {
public: public:
NCCHFile(std::vector<u8> buffer) : file_buffer(buffer) {} explicit NCCHFile(std::vector<u8> buffer);
ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override; ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) override; ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) override;