diff --git a/Kernel/Bus/USB/UHCIController.cpp b/Kernel/Bus/USB/UHCIController.cpp index 234abecedf..2d1ebbe290 100644 --- a/Kernel/Bus/USB/UHCIController.cpp +++ b/Kernel/Bus/USB/UHCIController.cpp @@ -199,8 +199,8 @@ UNMAP_AFTER_INIT ProcFSUSBBusDirectory::ProcFSUSBBusDirectory(const ProcFSBusDir UNMAP_AFTER_INIT void ProcFSUSBBusDirectory::initialize() { - auto folder = adopt_ref(*new ProcFSUSBBusDirectory(ProcFSComponentsRegistrar::the().buses_folder())); - ProcFSComponentsRegistrar::the().register_new_bus_folder(folder); + auto folder = adopt_ref(*new ProcFSUSBBusDirectory(ProcFSComponentRegistry::the().buses_folder())); + ProcFSComponentRegistry::the().register_new_bus_folder(folder); s_procfs_usb_bus_folder = folder; } diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp index 84b053eee1..2b3ecfb394 100644 --- a/Kernel/FileSystem/ProcFS.cpp +++ b/Kernel/FileSystem/ProcFS.cpp @@ -19,42 +19,42 @@ namespace Kernel { -static AK::Singleton s_the; +static AK::Singleton s_the; -ProcFSComponentsRegistrar& ProcFSComponentsRegistrar::the() +ProcFSComponentRegistry& ProcFSComponentRegistry::the() { return *s_the; } -UNMAP_AFTER_INIT void ProcFSComponentsRegistrar::initialize() +UNMAP_AFTER_INIT void ProcFSComponentRegistry::initialize() { VERIFY(!s_the.is_initialized()); s_the.ensure_instance(); } -UNMAP_AFTER_INIT ProcFSComponentsRegistrar::ProcFSComponentsRegistrar() +UNMAP_AFTER_INIT ProcFSComponentRegistry::ProcFSComponentRegistry() : m_root_folder(ProcFSRootDirectory::must_create()) { } -const ProcFSBusDirectory& ProcFSComponentsRegistrar::buses_folder() const +const ProcFSBusDirectory& ProcFSComponentRegistry::buses_folder() const { return *m_root_folder->m_buses_folder; } -void ProcFSComponentsRegistrar::register_new_bus_folder(ProcFSExposedDirectory& new_bus_folder) +void ProcFSComponentRegistry::register_new_bus_folder(ProcFSExposedDirectory& new_bus_folder) { VERIFY(!m_root_folder->m_buses_folder.is_null()); m_root_folder->m_buses_folder->m_components.append(new_bus_folder); } -void ProcFSComponentsRegistrar::register_new_process(Process& new_process) +void ProcFSComponentRegistry::register_new_process(Process& new_process) { Locker locker(m_lock); m_root_folder->m_process_folders.append(ProcFSProcessDirectory::create(new_process)); } -void ProcFSComponentsRegistrar::unregister_process(Process& deleted_process) +void ProcFSComponentRegistry::unregister_process(Process& deleted_process) { auto process_folder = m_root_folder->process_folder_for(deleted_process).release_nonnull(); process_folder->prepare_for_deletion(); @@ -115,7 +115,7 @@ ProcFSInode::~ProcFSInode() } ProcFS::ProcFS() - : m_root_inode(ProcFSComponentsRegistrar::the().root_folder().to_inode(*this)) + : m_root_inode(ProcFSComponentRegistry::the().root_folder().to_inode(*this)) { } diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp index 82e3317f74..bd58e60610 100644 --- a/Kernel/GlobalProcessExposed.cpp +++ b/Kernel/GlobalProcessExposed.cpp @@ -867,7 +867,7 @@ UNMAP_AFTER_INIT NonnullRefPtr ProcFSRootDirectory::must_cr KResult ProcFSRootDirectory::traverse_as_directory(unsigned fsid, Function callback) const { - Locker locker(ProcFSComponentsRegistrar::the().get_lock()); + Locker locker(ProcFSComponentRegistry::the().get_lock()); callback({ ".", { fsid, component_index() }, 0 }); callback({ "..", { fsid, 0 }, 0 }); diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 59ee2b207c..5c7448f56b 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -135,7 +135,7 @@ void Process::register_new(Process& process) RefPtr new_process = process; ScopedSpinLock lock(g_processes_lock); g_processes->prepend(process); - ProcFSComponentsRegistrar::the().register_new_process(process); + ProcFSComponentRegistry::the().register_new_process(process); } RefPtr Process::create_user_process(RefPtr& first_thread, const String& path, uid_t uid, gid_t gid, ProcessID parent_pid, int& error, Vector&& arguments, Vector&& environment, TTY* tty) @@ -576,7 +576,7 @@ void Process::finalize() // If we don't do it here, we can't drop the object later, and we can't // do this from the destructor because the state of the object doesn't // allow us to take references anymore. - ProcFSComponentsRegistrar::the().unregister_process(*this); + ProcFSComponentRegistry::the().unregister_process(*this); m_dead = true; @@ -728,7 +728,7 @@ void Process::FileDescriptionAndFlags::clear() void Process::FileDescriptionAndFlags::refresh_inode_index() { // FIXME: Verify Process::m_fds_lock is locked! - m_global_procfs_inode_index = ProcFSComponentsRegistrar::the().allocate_inode_index(); + m_global_procfs_inode_index = ProcFSComponentRegistry::the().allocate_inode_index(); } void Process::FileDescriptionAndFlags::set(NonnullRefPtr&& description, u32 flags) @@ -736,7 +736,7 @@ void Process::FileDescriptionAndFlags::set(NonnullRefPtr&& desc // FIXME: Verify Process::m_fds_lock is locked! m_description = move(description); m_flags = flags; - m_global_procfs_inode_index = ProcFSComponentsRegistrar::the().allocate_inode_index(); + m_global_procfs_inode_index = ProcFSComponentRegistry::the().allocate_inode_index(); } Custody& Process::root_directory() diff --git a/Kernel/ProcessExposed.cpp b/Kernel/ProcessExposed.cpp index a7a4bdd2d8..9d2679d650 100644 --- a/Kernel/ProcessExposed.cpp +++ b/Kernel/ProcessExposed.cpp @@ -26,7 +26,7 @@ static size_t s_allocate_inode_index() return s_next_inode_index.value(); } -InodeIndex ProcFSComponentsRegistrar::allocate_inode_index() const +InodeIndex ProcFSComponentRegistry::allocate_inode_index() const { return s_allocate_inode_index(); } @@ -242,7 +242,7 @@ RefPtr ProcFSExposedDirectory::lookup(StringView name) KResult ProcFSExposedDirectory::traverse_as_directory(unsigned fsid, Function callback) const { - Locker locker(ProcFSComponentsRegistrar::the().get_lock()); + Locker locker(ProcFSComponentRegistry::the().get_lock()); auto parent_folder = m_parent_folder.strong_ref(); if (parent_folder.is_null()) return KResult(EINVAL); diff --git a/Kernel/ProcessExposed.h b/Kernel/ProcessExposed.h index bd83bf2c6c..6401eabb31 100644 --- a/Kernel/ProcessExposed.h +++ b/Kernel/ProcessExposed.h @@ -28,15 +28,15 @@ class ProcFSRootDirectory; class ProcFSBusDirectory; class ProcFSSystemBoolean; -class ProcFSComponentsRegistrar { +class ProcFSComponentRegistry { public: - static ProcFSComponentsRegistrar& the(); + static ProcFSComponentRegistry& the(); static void initialize(); InodeIndex allocate_inode_index() const; - ProcFSComponentsRegistrar(); + ProcFSComponentRegistry(); void register_new_bus_folder(ProcFSExposedDirectory&); const ProcFSBusDirectory& buses_folder() const; @@ -92,7 +92,7 @@ class ProcFSExposedDirectory : public ProcFSExposedComponent , public Weakable { friend class ProcFSProcessDirectory; - friend class ProcFSComponentsRegistrar; + friend class ProcFSComponentRegistry; public: virtual KResultOr entries_count() const override { return m_components.size(); }; @@ -135,7 +135,7 @@ class ProcFSProcessInformation; class ProcFSProcessDirectory final : public ProcFSExposedDirectory { - friend class ProcFSComponentsRegistrar; + friend class ProcFSComponentRegistry; friend class ProcFSRootDirectory; friend class ProcFSProcessInformation; friend class ProcFSProcessPledge; @@ -170,7 +170,7 @@ private: class ProcFSRootDirectory; class ProcFSBusDirectory : public ProcFSExposedDirectory { - friend class ProcFSComponentsRegistrar; + friend class ProcFSComponentRegistry; public: static NonnullRefPtr must_create(const ProcFSRootDirectory& parent_folder); @@ -180,7 +180,7 @@ private: }; class ProcFSRootDirectory final : public ProcFSExposedDirectory { - friend class ProcFSComponentsRegistrar; + friend class ProcFSComponentRegistry; public: virtual RefPtr lookup(StringView name) override; diff --git a/Kernel/ProcessSpecificExposed.cpp b/Kernel/ProcessSpecificExposed.cpp index 2bec043f31..81e1e14be9 100644 --- a/Kernel/ProcessSpecificExposed.cpp +++ b/Kernel/ProcessSpecificExposed.cpp @@ -583,7 +583,7 @@ NonnullRefPtr ProcFSProcessDirectory::create(const Proce } ProcFSProcessDirectory::ProcFSProcessDirectory(const Process& process) - : ProcFSExposedDirectory(String::formatted("{:d}", process.pid().value()), ProcFSComponentsRegistrar::the().root_folder()) + : ProcFSExposedDirectory(String::formatted("{:d}", process.pid().value()), ProcFSComponentRegistry::the().root_folder()) , m_associated_process(process) { } diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index 6853876186..2df662465f 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -67,7 +67,7 @@ Thread::Thread(NonnullRefPtr process, NonnullOwnPtr kernel_stac , m_fpu_state(fpu_state) , m_name(m_process->name()) , m_block_timer(block_timer) - , m_global_procfs_inode_index(ProcFSComponentsRegistrar::the().allocate_inode_index()) + , m_global_procfs_inode_index(ProcFSComponentRegistry::the().allocate_inode_index()) { bool is_first_thread = m_process->add_thread(*this); if (is_first_thread) { diff --git a/Kernel/init.cpp b/Kernel/init.cpp index 93f43ec894..69ccc11dc3 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -144,7 +144,7 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init() // Initialize the PCI Bus as early as possible, for early boot (PCI based) serial logging SysFSComponentRegistry::initialize(); - ProcFSComponentsRegistrar::initialize(); + ProcFSComponentRegistry::initialize(); PCI::initialize(); PCISerialDevice::detect();