RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 19:14:58 +00:00
Code Issues Activity Actions

Add CoreInode::reverse_lookup().

Browse source 
Getting the absolute path of an ext2fs inode now uses the lookup cache
which makes it a lot faster.
This commit is contained in:
Andreas Kling 2018-11-15 17:04:55 +01:00
parent 5f434bc00b
commit eced5f11e3
7 changed files with 61 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

67
VirtualFileSystem/Ext2FileSystem.cpp
View file

@ -561,7 +561,7 @@ bool Ext2Inode::traverse_as_directory(Function<bool(const FileSystem::DirectoryE
return true;
}
bool Ext2FileSystem::enumerateDirectoryInode(InodeIdentifier inode, Function<bool(const DirectoryEntry&)> callback) const
bool Ext2FileSystem::deprecated_enumerateDirectoryInode(InodeIdentifier inode, Function<bool(const DirectoryEntry&)> callback) const
{
ASSERT(inode.fsid() == id());
ASSERT(isDirectoryInode(inode.index()));
@ -599,7 +599,7 @@ bool Ext2FileSystem::addInodeToDirectory(unsigned directoryInode, unsigned inode
Vector<DirectoryEntry> entries;
bool nameAlreadyExists = false;
enumerateDirectoryInode({ id(), directoryInode }, [&] (const DirectoryEntry& entry) {
deprecated_enumerateDirectoryInode({ id(), directoryInode }, [&] (const DirectoryEntry& entry) {
if (!strcmp(entry.name, name.characters())) {
nameAlreadyExists = true;
return false;
@ -1139,40 +1139,55 @@ InodeIdentifier Ext2FileSystem::find_parent_of_inode(InodeIdentifier inode_id) c
InodeIdentifier foundParent;
for (auto& directory : directories_in_group) {
directory->traverse_as_directory([inode, directory, &foundParent] (auto& entry) {
if (entry.inode == inode->identifier()) {
foundParent = directory->identifier();
return false;
}
return true;
});
if (foundParent.isValid())
if (!directory->reverse_lookup(inode->identifier()).isNull()) {
foundParent = directory->identifier();
break;
}
}
return foundParent;
}
void Ext2Inode::populate_lookup_cache()
{
{
LOCKER(m_lock);
if (!m_lookup_cache.isEmpty())
return;
}
HashMap<String, unsigned> children;
traverse_as_directory([&children] (auto& entry) {
children.set(String(entry.name, entry.name_length), entry.inode.index());
return true;
});
LOCKER(m_lock);
if (!m_lookup_cache.isEmpty())
return;
m_lookup_cache = move(children);
}
InodeIdentifier Ext2Inode::lookup(const String& name)
{
ASSERT(is_directory());
if (m_child_cache.isEmpty()) {
HashMap<String, unsigned> children;
traverse_as_directory([&children] (auto& entry) {
children.set(String(entry.name, entry.name_length), entry.inode.index());
return true;
});
LOCKER(m_lock);
m_child_cache = move(children);
}
populate_lookup_cache();
LOCKER(m_lock);
auto it = m_child_cache.find(name);
if (it != m_child_cache.end())
auto it = m_lookup_cache.find(name);
if (it != m_lookup_cache.end())
return { fsid(), (*it).value };
return { };
}
String Ext2Inode::reverse_lookup(InodeIdentifier child_id)
{
ASSERT(is_directory());
ASSERT(child_id.fsid() == fsid());
populate_lookup_cache();
LOCKER(m_lock);
for (auto it : m_lookup_cache) {
if (it.value == child_id.index())
return it.key;
}
return { };
}