VERY experimental Nintendo Switch 2 emulator
C++
romfs: use vfs_cached for romfs output
Liam445948d29781
diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cppindex fb5683a6bc..614da21307 100644--- a/src/core/file_sys/romfs.cpp+++ b/src/core/file_sys/romfs.cpp@@ -9,6 +9,7 @@#include "core/file_sys/fsmitm_romfsbuild.h"#include "core/file_sys/romfs.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_offset.h"#include "core/file_sys/vfs_vector.h"@@ -132,7 +133,7 @@ VirtualDir ExtractRomFS(VirtualFile file, RomFSExtractionType type) {out = out->GetSubdirectories().front();}- return out;+ return std::make_shared<CachedVfsDirectory>(out);}VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) {diff --git a/src/core/file_sys/vfs_vector.cpp b/src/core/file_sys/vfs_vector.cppindex af1df4c514..251d9d7c9f 100644--- a/src/core/file_sys/vfs_vector.cpp+++ b/src/core/file_sys/vfs_vector.cpp@@ -67,23 +67,6 @@ VectorVfsDirectory::VectorVfsDirectory(std::vector<VirtualFile> files_,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 {return files;}@@ -124,7 +107,6 @@ bool VectorVfsDirectory::DeleteSubdirectory(std::string_view subdir_name) {}bool VectorVfsDirectory::DeleteFile(std::string_view file_name) {- optimized_file_index_built = false;return FindAndRemoveVectorElement(files, file_name);}@@ -142,7 +124,6 @@ VirtualFile VectorVfsDirectory::CreateFile(std::string_view file_name) {}void VectorVfsDirectory::AddFile(VirtualFile file) {- optimized_file_index_built = false;files.push_back(std::move(file));}diff --git a/src/core/file_sys/vfs_vector.h b/src/core/file_sys/vfs_vector.hindex c9955755bf..bfedb6e42a 100644--- a/src/core/file_sys/vfs_vector.h+++ b/src/core/file_sys/vfs_vector.h@@ -105,7 +105,6 @@ public:VirtualDir parent = nullptr);~VectorVfsDirectory() override;- VirtualFile GetFile(std::string_view file_name) const override;std::vector<VirtualFile> GetFiles() const override;std::vector<VirtualDir> GetSubdirectories() const override;bool IsWritable() const override;@@ -127,9 +126,6 @@ private:VirtualDir parent;std::string name;-- mutable std::map<std::string, size_t, std::less<>> optimized_file_index;- mutable bool optimized_file_index_built{};};} // namespace FileSys