RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:08:12 +00:00
Code Issues Activity Actions

Kernel/Ext2FS: Use HashMap::remove_all_matching() in Ext2FS

Browse source 
This makes the inode cache eviction mechanism quite a bit easier
to understand, thanks to the new expressive API. :^)
This commit is contained in:
Andreas Kling 2022-01-05 17:11:53 +01:00
parent 2375e1bcda
commit bcc0186bbc
1 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -700,34 +700,19 @@ void Ext2FS::flush_writes()
// Uncache Inodes that are only kept alive by the index-to-inode lookup cache. // Uncache Inodes that are only kept alive by the index-to-inode lookup cache.
// We don't uncache Inodes that are being watched by at least one InodeWatcher. // We don't uncache Inodes that are being watched by at least one InodeWatcher.
Optional<InodeIndex> last_index {};
auto remove_previous_entry_from_cache = [&]() {
if (last_index.has_value()) {
m_inode_cache.remove(last_index.value());
last_index.clear();
}
};
// FIXME: It would be better to keep a capped number of Inodes around. // FIXME: It would be better to keep a capped number of Inodes around.
// The problem is that they are quite heavy objects, and use a lot of heap memory // The problem is that they are quite heavy objects, and use a lot of heap memory
// for their (child name lookup) and (block list) caches. // for their (child name lookup) and (block list) caches.
for (auto& it : m_inode_cache) {
remove_previous_entry_from_cache();
m_inode_cache.remove_all_matching([](InodeIndex, RefPtr<Ext2FSInode> const& cached_inode) {
// NOTE: If we're asked to look up an inode by number (via get_inode) and it turns out // NOTE: If we're asked to look up an inode by number (via get_inode) and it turns out
// to not exist, we remember the fact that it doesn't exist by caching a nullptr. // to not exist, we remember the fact that it doesn't exist by caching a nullptr.
// This seems like a reasonable time to uncache ideas about unknown inodes, so do that. // This seems like a reasonable time to uncache ideas about unknown inodes, so do that.
if (!it.value) { if (cached_inode == nullptr)
last_index = it.key; return true;
continue;
} return cached_inode->ref_count() == 1 && !cached_inode->has_watchers();
if (it.value->ref_count() != 1) });
continue;
if (it.value->has_watchers())
continue;
last_index = it.key;
}
remove_previous_entry_from_cache();
} }
BlockBasedFileSystem::flush_writes(); BlockBasedFileSystem::flush_writes();