From acccf9ccda13e134c3fb75b78d26c9465aa23510 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Sun, 18 Aug 2019 14:48:15 +0300 Subject: Kernel: Move device lookup to Device class itself Previously, VFS stored a list of all devices, and devices had to register and unregister themselves with it. This cleans up things a bit. --- Kernel/Devices/Device.cpp | 29 ++++++++++++++++++++++++++--- Kernel/Devices/Device.h | 8 +++++++- Kernel/FileSystem/DevPtsFS.cpp | 2 +- Kernel/FileSystem/VirtualFileSystem.cpp | 23 +++-------------------- Kernel/FileSystem/VirtualFileSystem.h | 6 ------ Kernel/Process.cpp | 2 +- 6 files changed, 38 insertions(+), 32 deletions(-) (limited to 'Kernel') diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp index 39f7c16f4b..86458f77ae 100644 --- a/Kernel/Devices/Device.cpp +++ b/Kernel/Devices/Device.cpp @@ -1,17 +1,40 @@ #include -#include +#include #include +static HashMap* s_all_devices; + +HashMap& Device::all_devices() +{ + if (s_all_devices == nullptr) + s_all_devices = new HashMap; + return *s_all_devices; +} + +void Device::for_each(Function callback) +{ + for (auto& entry : all_devices()) + callback(*entry.value); +} + +Device* Device::get_device(unsigned major, unsigned minor) +{ + auto it = all_devices().find(encoded_device(major, minor)); + if (it == all_devices().end()) + return nullptr; + return it->value; +} + Device::Device(unsigned major, unsigned minor) : m_major(major) , m_minor(minor) { - VFS::the().register_device({}, *this); + all_devices().set(encoded_device(m_major, m_minor), this); } Device::~Device() { - VFS::the().unregister_device({}, *this); + all_devices().remove(encoded_device(m_major, m_minor)); } String Device::absolute_path() const diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h index 9455d4e4a3..cf333e7404 100644 --- a/Kernel/Devices/Device.h +++ b/Kernel/Devices/Device.h @@ -2,13 +2,14 @@ // Device is the base class of everything that lives in the /dev directory. // -// All Devices will automatically register with the VFS. // To expose a Device to the filesystem, simply pass two unique numbers to the constructor, // and then mknod a file in /dev with those numbers. // // There are two main subclasses: // - BlockDevice (random access) // - CharacterDevice (sequential) +#include +#include #include #include @@ -28,11 +29,16 @@ public: virtual bool is_device() const override { return true; } virtual bool is_disk_device() const { return false; } + static void for_each(Function); + static Device* get_device(unsigned major, unsigned minor); + protected: Device(unsigned major, unsigned minor); void set_uid(uid_t uid) { m_uid = uid; } void set_gid(gid_t gid) { m_gid = gid; } + static HashMap& all_devices(); + private: unsigned m_major { 0 }; unsigned m_minor { 0 }; diff --git a/Kernel/FileSystem/DevPtsFS.cpp b/Kernel/FileSystem/DevPtsFS.cpp index cb7203d83b..73d2113e51 100644 --- a/Kernel/FileSystem/DevPtsFS.cpp +++ b/Kernel/FileSystem/DevPtsFS.cpp @@ -69,7 +69,7 @@ RefPtr DevPtsFS::get_inode(InodeIdentifier inode_id) const return m_root_inode; unsigned pty_index = inode_index_to_pty_index(inode_id.index()); - auto* device = VFS::the().get_device(11, pty_index); + auto* device = Device::get_device(11, pty_index); ASSERT(device); auto inode = adopt(*new DevPtsFSInode(const_cast(*this), inode_id.index())); diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp index 3b2b9c5274..459753221c 100644 --- a/Kernel/FileSystem/VirtualFileSystem.cpp +++ b/Kernel/FileSystem/VirtualFileSystem.cpp @@ -216,11 +216,11 @@ KResultOr> VFS::open(StringView path, int options } if (metadata.is_device()) { - auto it = m_devices.find(encoded_device(metadata.major_device, metadata.minor_device)); - if (it == m_devices.end()) { + auto device = Device::get_device(metadata.major_device, metadata.minor_device); + if (device == nullptr) { return KResult(-ENODEV); } - auto descriptor_or_error = (*it).value->open(options); + auto descriptor_or_error = device->open(options); if (descriptor_or_error.is_error()) return descriptor_or_error.error(); descriptor_or_error.value()->set_original_inode({}, inode); @@ -615,23 +615,6 @@ InodeIdentifier VFS::Mount::host() const return m_host_custody->inode().identifier(); } -void VFS::register_device(Badge, Device& device) -{ - m_devices.set(encoded_device(device.major(), device.minor()), &device); -} - -void VFS::unregister_device(Badge, Device& device) -{ - m_devices.remove(encoded_device(device.major(), device.minor())); -} - -Device* VFS::get_device(unsigned major, unsigned minor) -{ - auto it = m_devices.find(encoded_device(major, minor)); - if (it == m_devices.end()) - return nullptr; - return (*it).value; -} void VFS::for_each_mount(Function callback) const { diff --git a/Kernel/FileSystem/VirtualFileSystem.h b/Kernel/FileSystem/VirtualFileSystem.h index dcce762312..f439d675c1 100644 --- a/Kernel/FileSystem/VirtualFileSystem.h +++ b/Kernel/FileSystem/VirtualFileSystem.h @@ -79,9 +79,6 @@ public: KResult mknod(StringView path, mode_t, dev_t, Custody& base); KResultOr> open_directory(StringView path, Custody& base); - void register_device(Badge, Device&); - void unregister_device(Badge, Device&); - size_t mount_count() const { return m_mounts.size(); } void for_each_mount(Function) const; @@ -89,8 +86,6 @@ public: void sync(); - Device* get_device(unsigned major, unsigned minor); - Custody& root_custody(); KResultOr> resolve_path(StringView path, Custody& base, RefPtr* parent = nullptr, int options = 0); @@ -110,7 +105,6 @@ private: RefPtr m_root_inode; NonnullOwnPtrVector m_mounts; - HashMap m_devices; RefPtr m_root_custody; }; diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index b562068d06..5dee5358b5 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -2764,7 +2764,7 @@ int Process::sys$mount(const char* device_path, const char* mountpoint, const ch auto major = metadata_or_error.value().major_device; auto minor = metadata_or_error.value().minor_device; - auto* device = VFS::the().get_device(major, minor); + auto* device = Device::get_device(major, minor); if (!device) { dbg() << "mount: device (" << major << "," << minor << ") not found"; return -ENODEV; -- cgit v1.2.3