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

Kernel: Make AddressSpace::amount_clean_inode() OOM-fallible

Browse source
This commit is contained in:
Idan Horowitz 2022-01-25 15:02:37 +02:00
parent daf6b59a01
commit bd603003b5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/GlobalProcessExposed.cpp
View file

@ -498,7 +498,7 @@ private:
process_object.add("amount_virtual", process.address_space().amount_virtual()); process_object.add("amount_virtual", process.address_space().amount_virtual());
process_object.add("amount_resident", process.address_space().amount_resident()); process_object.add("amount_resident", process.address_space().amount_resident());
process_object.add("amount_dirty_private", process.address_space().amount_dirty_private()); process_object.add("amount_dirty_private", process.address_space().amount_dirty_private());
process_object.add("amount_clean_inode", process.address_space().amount_clean_inode()); process_object.add("amount_clean_inode", TRY(process.address_space().amount_clean_inode()));
process_object.add("amount_shared", process.address_space().amount_shared()); process_object.add("amount_shared", process.address_space().amount_shared());
process_object.add("amount_purgeable_volatile", process.address_space().amount_purgeable_volatile()); process_object.add("amount_purgeable_volatile", process.address_space().amount_purgeable_volatile());
process_object.add("amount_purgeable_nonvolatile", process.address_space().amount_purgeable_nonvolatile()); process_object.add("amount_purgeable_nonvolatile", process.address_space().amount_purgeable_nonvolatile());

4
Kernel/Memory/AddressSpace.cpp
View file

@ -341,13 +341,13 @@ size_t AddressSpace::amount_dirty_private() const
return amount; return amount;
} }
size_t AddressSpace::amount_clean_inode() const ErrorOr<size_t> AddressSpace::amount_clean_inode() const
{ {
SpinlockLocker lock(m_lock); SpinlockLocker lock(m_lock);
HashTable<const InodeVMObject*> vmobjects; HashTable<const InodeVMObject*> vmobjects;
for (auto const& region : m_regions) { for (auto const& region : m_regions) {
if (region->vmobject().is_inode()) if (region->vmobject().is_inode())
vmobjects.set(&static_cast<const InodeVMObject&>(region->vmobject())); TRY(vmobjects.try_set(&static_cast<const InodeVMObject&>(region->vmobject())));
} }
size_t amount = 0; size_t amount = 0;
for (auto& vmobject : vmobjects) for (auto& vmobject : vmobjects)

2
Kernel/Memory/AddressSpace.h
View file

@ -57,7 +57,7 @@ public:
RecursiveSpinlock& get_lock() const { return m_lock; } RecursiveSpinlock& get_lock() const { return m_lock; }
size_t amount_clean_inode() const; ErrorOr<size_t> amount_clean_inode() const;
size_t amount_dirty_private() const; size_t amount_dirty_private() const;
size_t amount_virtual() const; size_t amount_virtual() const;
size_t amount_resident() const; size_t amount_resident() const;