mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-12-25 15:39:55 +00:00
Kernel: Made DiskCache entries a KBuffer
The Cache entries found in `DiskBackedFileSystem` are now stored in a `KBuffer` object, instead of relying on `kmalloc_eternal`. The number of entries was exceeding that of the number of bytes allocated to `kmalloc_eternal`, which in turn caused `mount()` to fail epically when called.
This commit is contained in:
parent
1ce8a175e1
commit
06b6af61c6
Notes:
sideshowbarker
2024-07-19 11:45:22 +09:00
Author: https://github.com/Quaker762 Commit: https://github.com/SerenityOS/serenity/commit/06b6af61c69 Pull-request: https://github.com/SerenityOS/serenity/pull/638
1 changed files with 10 additions and 6 deletions
|
@ -18,10 +18,10 @@ public:
|
|||
explicit DiskCache(DiskBackedFS& fs)
|
||||
: m_fs(fs)
|
||||
, m_cached_block_data(KBuffer::create_with_size(m_entry_count * m_fs.block_size()))
|
||||
, m_entries(KBuffer::create_with_size(m_entry_count * sizeof(CacheEntry)))
|
||||
{
|
||||
m_entries = (CacheEntry*)kmalloc_eternal(m_entry_count * sizeof(CacheEntry));
|
||||
for (size_t i = 0; i < m_entry_count; ++i) {
|
||||
m_entries[i].data = m_cached_block_data.data() + i * m_fs.block_size();
|
||||
entries()[i].data = m_cached_block_data.data() + i * m_fs.block_size();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@ public:
|
|||
|
||||
CacheEntry* oldest_clean_entry = nullptr;
|
||||
for (size_t i = 0; i < m_entry_count; ++i) {
|
||||
auto& entry = m_entries[i];
|
||||
auto& entry = const_cast<CacheEntry&>(entries()[i]);
|
||||
if (entry.block_index == block_index) {
|
||||
entry.timestamp = now;
|
||||
return entry;
|
||||
|
@ -63,18 +63,21 @@ public:
|
|||
return new_entry;
|
||||
}
|
||||
|
||||
const CacheEntry* entries() const { return (const CacheEntry*)m_entries.data(); }
|
||||
CacheEntry* entries() { return (CacheEntry*)m_entries.data(); }
|
||||
|
||||
template<typename Callback>
|
||||
void for_each_entry(Callback callback)
|
||||
{
|
||||
for (size_t i = 0; i < m_entry_count; ++i)
|
||||
callback(m_entries[i]);
|
||||
callback(entries()[i]);
|
||||
}
|
||||
|
||||
private:
|
||||
DiskBackedFS& m_fs;
|
||||
size_t m_entry_count { 10000 };
|
||||
KBuffer m_cached_block_data;
|
||||
CacheEntry* m_entries { nullptr };
|
||||
KBuffer m_entries;
|
||||
bool m_dirty { false };
|
||||
};
|
||||
|
||||
|
@ -160,7 +163,8 @@ void DiskBackedFS::flush_writes()
|
|||
entry.is_dirty = false;
|
||||
});
|
||||
cache().set_dirty(false);
|
||||
dbg() << class_name() << ": " << "Flushed " << count << " blocks to disk";
|
||||
dbg() << class_name() << ": "
|
||||
<< "Flushed " << count << " blocks to disk";
|
||||
}
|
||||
|
||||
DiskCache& DiskBackedFS::cache() const
|
||||
|
|
Loading…
Reference in a new issue