Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-12 02:00:52 +01:00
Code Releases Wiki Activity

impr: Drastically improve file reading performance

Browse Source
This commit is contained in:
WerWolv 2023-03-17 11:31:50 +01:00
parent 64be6d89ee
commit f10fb56042
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/external/libwolv vendored

@ -1 +1 @@
Subproject commit 0f88984f1d8cac72c86e875a6a12b4a542944110
Subproject commit 213c0efc90a15a2034f744f64779bd097e5735a7

9
plugins/builtin/include/content/providers/file_provider.hpp
View File

@ -54,19 +54,18 @@ namespace hex::plugin::builtin {
[[nodiscard]] std::pair<Region, bool> getRegionValidity(u64 address) const override;
private:
wolv::io::File& getFile();
protected:
std::fs::path m_path;
wolv::io::File m_file;
std::map<std::thread::id, wolv::io::File> m_files;
size_t m_fileSize = 0;
std::optional<struct stat> m_fileStats;
std::mutex m_mutex;
bool m_readable = false, m_writable = false;
bool m_openReadOnly = true;
u64 m_bufferStartAddress;
std::vector<u8> m_buffer;
};
}

29
plugins/builtin/source/content/providers/file_provider.cpp
View File

@ -16,7 +16,7 @@
namespace hex::plugin::builtin {
bool FileProvider::isAvailable() const {
return this->m_file.isValid();
return true;
}
bool FileProvider::isReadable() const {
@ -62,29 +62,21 @@ namespace hex::plugin::builtin {
if (offset > (this->getActualSize() - size) || buffer == nullptr || size == 0)
return;
std::scoped_lock lock(this->m_mutex);
if (offset < this->m_bufferStartAddress || offset + size > this->m_bufferStartAddress + this->m_buffer.size() || this->m_buffer.size() < size) {
this->m_buffer.resize(std::min<size_t>(std::max<size_t>(0x100, size), this->getActualSize() - offset));
this->m_file.seek(offset);
this->m_file.readBuffer(this->m_buffer.data(), this->m_buffer.size());
this->m_bufferStartAddress = offset;
}
std::memcpy(buffer, this->m_buffer.data() + (offset - this->m_bufferStartAddress), std::min<size_t>(size, this->m_buffer.size()));
auto &file = this->getFile();
file.seek(offset);
file.readBuffer(reinterpret_cast<u8*>(buffer), size);
}
void FileProvider::writeRaw(u64 offset, const void *buffer, size_t size) {
if ((offset + size) > this->getActualSize() || buffer == nullptr || size == 0)
return;
std::scoped_lock lock(this->m_mutex);
wolv::io::File writeFile(this->m_path, wolv::io::File::Mode::Write);
if (!writeFile.isValid())
return;
writeFile.seek(offset);
writeFile.write(reinterpret_cast<const u8*>(buffer), size);
this->m_buffer.clear();
}
void FileProvider::save() {
@ -211,8 +203,7 @@ namespace hex::plugin::builtin {
}
this->m_fileStats = file.getFileInfo();
this->m_fileSize = file.getSize();
this->m_file = std::move(file);
this->m_fileSize = file.getSize();
return true;
}
@ -221,6 +212,16 @@ namespace hex::plugin::builtin {
}
wolv::io::File& FileProvider::getFile() {
if (this->m_files.size() > 5)
this->m_files.clear();
if (!this->m_files.contains(std::this_thread::get_id()))
this->m_files.emplace(std::this_thread::get_id(), wolv::io::File(this->m_path, wolv::io::File::Mode::Read));
return this->m_files[std::this_thread::get_id()];
}
void FileProvider::loadSettings(const nlohmann::json &settings) {
Provider::loadSettings(settings);