mirror/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-09-15 00:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

romfs: use vfs_cached for romfs output

Browse Source
This commit is contained in:
Liam 2023-06-03 08:56:59 -04:00
parent 790f91fcc5
commit 6e23c84669
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/file_sys/romfs.cpp
View File

@ -9,6 +9,7 @@
#include "core/file_sys/fsmitm_romfsbuild.h" #include "core/file_sys/fsmitm_romfsbuild.h"
#include "core/file_sys/romfs.h" #include "core/file_sys/romfs.h"
#include "core/file_sys/vfs.h" #include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_cached.h"
#include "core/file_sys/vfs_concat.h" #include "core/file_sys/vfs_concat.h"
#include "core/file_sys/vfs_offset.h" #include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs_vector.h" #include "core/file_sys/vfs_vector.h"
@ -132,7 +133,7 @@ VirtualDir ExtractRomFS(VirtualFile file, RomFSExtractionType type) {
out = out->GetSubdirectories().front(); out = out->GetSubdirectories().front();
} }
return out; return std::make_shared<CachedVfsDirectory>(out);
} }
VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) { VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) {

19
src/core/file_sys/vfs_vector.cpp
View File

@ -67,23 +67,6 @@ VectorVfsDirectory::VectorVfsDirectory(std::vector<VirtualFile> files_,
VectorVfsDirectory::~VectorVfsDirectory() = default; VectorVfsDirectory::~VectorVfsDirectory() = default;
VirtualFile VectorVfsDirectory::GetFile(std::string_view file_name) const {
if (!optimized_file_index_built) {
optimized_file_index.clear();
for (size_t i = 0; i < files.size(); i++) {
optimized_file_index.emplace(files[i]->GetName(), i);
}
optimized_file_index_built = true;
}
const auto it = optimized_file_index.find(file_name);
if (it != optimized_file_index.end()) {
return files[it->second];
}
return nullptr;
}
std::vector<VirtualFile> VectorVfsDirectory::GetFiles() const { std::vector<VirtualFile> VectorVfsDirectory::GetFiles() const {
return files; return files;
} }
@ -124,7 +107,6 @@ bool VectorVfsDirectory::DeleteSubdirectory(std::string_view subdir_name) {
} }
bool VectorVfsDirectory::DeleteFile(std::string_view file_name) { bool VectorVfsDirectory::DeleteFile(std::string_view file_name) {
optimized_file_index_built = false;
return FindAndRemoveVectorElement(files, file_name); return FindAndRemoveVectorElement(files, file_name);
} }
@ -142,7 +124,6 @@ VirtualFile VectorVfsDirectory::CreateFile(std::string_view file_name) {
} }
void VectorVfsDirectory::AddFile(VirtualFile file) { void VectorVfsDirectory::AddFile(VirtualFile file) {
optimized_file_index_built = false;
files.push_back(std::move(file)); files.push_back(std::move(file));
} }

4
src/core/file_sys/vfs_vector.h
View File

@ -105,7 +105,6 @@ public:
VirtualDir parent = nullptr); VirtualDir parent = nullptr);
~VectorVfsDirectory() override; ~VectorVfsDirectory() override;
VirtualFile GetFile(std::string_view file_name) const override;
std::vector<VirtualFile> GetFiles() const override; std::vector<VirtualFile> GetFiles() const override;
std::vector<VirtualDir> GetSubdirectories() const override; std::vector<VirtualDir> GetSubdirectories() const override;
bool IsWritable() const override; bool IsWritable() const override;
@ -127,9 +126,6 @@ private:
VirtualDir parent; VirtualDir parent;
std::string name; std::string name;
mutable std::map<std::string, size_t, std::less<>> optimized_file_index;
mutable bool optimized_file_index_built{};
}; };
} // namespace FileSys } // namespace FileSys