RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:47:35 +00:00
Code Issues Activity Actions

Assistant: Use fstatat() while building FileProvider path cache

Browse source 
Using fstatat() allows the kernel to do relative path resolution as
opposed to absolute path resolution, which is significantly faster
and allows us to build the path cache sooner. :^)
This commit is contained in:
Andreas Kling 2021-07-03 18:10:06 +02:00
parent 801f74362e
commit 4fce72a967
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Applications/Assistant/Providers.cpp
View file

@ -6,8 +6,10 @@
#include "Providers.h" #include "Providers.h"
#include "FuzzyMatch.h" #include "FuzzyMatch.h"
#include <AK/LexicalPath.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/ElapsedTimer.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibDesktop/Launcher.h> #include <LibDesktop/Launcher.h>
@ -18,6 +20,7 @@
#include <LibJS/Parser.h> #include <LibJS/Parser.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <serenity.h> #include <serenity.h>
#include <spawn.h> #include <spawn.h>
#include <unistd.h> #include <unistd.h>
@ -151,28 +154,34 @@ void FileProvider::build_filesystem_cache()
m_work_queue.enqueue("/"); m_work_queue.enqueue("/");
Threading::BackgroundAction<int>::create([this](auto&) { Threading::BackgroundAction<int>::create([this](auto&) {
String slash = "/";
Core::ElapsedTimer timer;
timer.start();
while (!m_work_queue.is_empty()) { while (!m_work_queue.is_empty()) {
auto start = m_work_queue.dequeue(); auto base_directory = m_work_queue.dequeue();
Core::DirIterator di(start, Core::DirIterator::SkipDots); Core::DirIterator di(base_directory, Core::DirIterator::SkipDots);
while (di.has_next()) { while (di.has_next()) {
auto path = di.next_full_path(); auto path = di.next_path();
struct stat st = {}; struct stat st = {};
if (lstat(path.characters(), &st) < 0) { if (fstatat(di.fd(), path.characters(), &st, AT_SYMLINK_NOFOLLOW) < 0) {
perror("stat"); perror("fstatat");
continue; continue;
} }
if (S_ISLNK(st.st_mode)) if (S_ISLNK(st.st_mode))
continue; continue;
m_full_path_cache.append(path); auto full_path = LexicalPath::join(slash, base_directory, path).string();
m_full_path_cache.append(full_path);
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
m_work_queue.enqueue(path); m_work_queue.enqueue(full_path);
} }
} }
} }
dbgln("Built cache in {} ms", timer.elapsed());
return 0; }, [this](auto) { m_building_cache = false; }); return 0; }, [this](auto) { m_building_cache = false; });
} }