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

ProcFS: Do not assume there is one of it

Browse source 
The complication is around /proc/sys/ variables, which were attached
to inodes. Now they're their own thing, and the corresponding inodes
are lazily created (as all other ProcFS inodes are) and simply refer
to them by index.
This commit is contained in:
Sergey Bugaev 2019-08-16 16:35:02 +03:00 • committed by Andreas Kling
parent 1febd59f83
commit 37cc80fb96
4 changed files with 144 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Kernel/FileSystem/ProcFS.h
View file

@ -14,8 +14,6 @@ class ProcFS final : public FS {
friend class ProcFSInode;
public:
static ProcFS& the();
virtual ~ProcFS() override;
static NonnullRefPtr<ProcFS> create();
@ -28,9 +26,8 @@ public:
virtual RefPtr<Inode> create_inode(InodeIdentifier parent_id, const String& name, mode_t, off_t size, dev_t, int& error) override;
virtual RefPtr<Inode> create_directory(InodeIdentifier parent_id, const String& name, mode_t, int& error) override;
void add_sys_file(String&&, Function<ByteBuffer(ProcFSInode&)>&& read_callback, Function<ssize_t(ProcFSInode&, const ByteBuffer&)>&& write_callback);
void add_sys_bool(String&&, Lockable<bool>&, Function<void()>&& notify_callback = nullptr);
void add_sys_string(String&&, Lockable<String>&, Function<void()>&& notify_callback = nullptr);
static void add_sys_bool(String&&, Lockable<bool>&, Function<void()>&& notify_callback = nullptr);
static void add_sys_string(String&&, Lockable<String>&, Function<void()>&& notify_callback = nullptr);
private:
ProcFS();
@ -57,16 +54,10 @@ private:
ProcFSDirectoryEntry* get_directory_entry(InodeIdentifier) const;
Vector<ProcFSDirectoryEntry> m_entries;
Vector<ProcFSDirectoryEntry> m_sys_entries;
mutable Lock m_inodes_lock;
mutable HashMap<unsigned, ProcFSInode*> m_inodes;
RefPtr<ProcFSInode> m_root_inode;
Lockable<bool> m_kmalloc_stack_helper;
};
struct ProcFSInodeCustomData {
virtual ~ProcFSInodeCustomData();
};
class ProcFSInode final : public Inode {
@ -75,10 +66,6 @@ class ProcFSInode final : public Inode {
public:
virtual ~ProcFSInode() override;
void set_custom_data(OwnPtr<ProcFSInodeCustomData>&& custom_data) { m_custom_data = move(custom_data); }
ProcFSInodeCustomData* custom_data() { return m_custom_data.ptr(); }
const ProcFSInodeCustomData* custom_data() const { return m_custom_data.ptr(); }
private:
// ^Inode
virtual ssize_t read_bytes(off_t, ssize_t, u8* buffer, FileDescription*) const override;
@ -96,6 +83,4 @@ private:
ProcFS& fs() { return static_cast<ProcFS&>(Inode::fs()); }
const ProcFS& fs() const { return static_cast<const ProcFS&>(Inode::fs()); }
ProcFSInode(ProcFS&, unsigned index);
OwnPtr<ProcFSInodeCustomData> m_custom_data;
};