mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 18:17:45 +00:00
Kernel: Rename InodeVMObject => SharedInodeVMObject
This commit is contained in:
parent
46256da7b0
commit
07a26aece3
9 changed files with 63 additions and 63 deletions
|
@ -31,7 +31,7 @@
|
|||
#include <Kernel/FileSystem/Inode.h>
|
||||
#include <Kernel/Multiboot.h>
|
||||
#include <Kernel/VM/AnonymousVMObject.h>
|
||||
#include <Kernel/VM/InodeVMObject.h>
|
||||
#include <Kernel/VM/SharedInodeVMObject.h>
|
||||
#include <Kernel/VM/MemoryManager.h>
|
||||
#include <Kernel/VM/PageDirectory.h>
|
||||
#include <Kernel/VM/PhysicalRegion.h>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <Kernel/Process.h>
|
||||
#include <Kernel/Thread.h>
|
||||
#include <Kernel/VM/AnonymousVMObject.h>
|
||||
#include <Kernel/VM/InodeVMObject.h>
|
||||
#include <Kernel/VM/SharedInodeVMObject.h>
|
||||
#include <Kernel/VM/MemoryManager.h>
|
||||
#include <Kernel/VM/PageDirectory.h>
|
||||
#include <Kernel/VM/Region.h>
|
||||
|
@ -50,7 +50,7 @@ Region::Region(const Range& range, const String& name, u8 access, bool cacheable
|
|||
|
||||
Region::Region(const Range& range, NonnullRefPtr<Inode> inode, const String& name, u8 access, bool cacheable)
|
||||
: m_range(range)
|
||||
, m_vmobject(InodeVMObject::create_with_inode(*inode))
|
||||
, m_vmobject(SharedInodeVMObject::create_with_inode(*inode))
|
||||
, m_name(name)
|
||||
, m_access(access)
|
||||
, m_cacheable(cacheable)
|
||||
|
@ -86,7 +86,7 @@ NonnullOwnPtr<Region> Region::clone()
|
|||
{
|
||||
ASSERT(Process::current);
|
||||
|
||||
// FIXME: What should we do for privately mapped InodeVMObjects?
|
||||
// FIXME: What should we do for privately mapped SharedInodeVMObjects?
|
||||
if (m_shared || vmobject().is_inode()) {
|
||||
ASSERT(!m_stack);
|
||||
#ifdef MM_DEBUG
|
||||
|
@ -167,7 +167,7 @@ size_t Region::amount_dirty() const
|
|||
{
|
||||
if (!vmobject().is_inode())
|
||||
return amount_resident();
|
||||
return static_cast<const InodeVMObject&>(vmobject()).amount_dirty();
|
||||
return static_cast<const SharedInodeVMObject&>(vmobject()).amount_dirty();
|
||||
}
|
||||
|
||||
size_t Region::amount_resident() const
|
||||
|
@ -452,7 +452,7 @@ PageFaultResponse Region::handle_inode_fault(size_t page_index_in_region)
|
|||
LOCKER(vmobject().m_paging_lock);
|
||||
cli();
|
||||
|
||||
auto& inode_vmobject = static_cast<InodeVMObject&>(vmobject());
|
||||
auto& inode_vmobject = static_cast<SharedInodeVMObject&>(vmobject());
|
||||
auto& vmobject_physical_page_entry = inode_vmobject.physical_pages()[first_page_index() + page_index_in_region];
|
||||
|
||||
#ifdef PAGE_FAULT_DEBUG
|
||||
|
|
|
@ -25,46 +25,46 @@
|
|||
*/
|
||||
|
||||
#include <Kernel/FileSystem/Inode.h>
|
||||
#include <Kernel/VM/InodeVMObject.h>
|
||||
#include <Kernel/VM/SharedInodeVMObject.h>
|
||||
#include <Kernel/VM/MemoryManager.h>
|
||||
#include <Kernel/VM/Region.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
NonnullRefPtr<InodeVMObject> InodeVMObject::create_with_inode(Inode& inode)
|
||||
NonnullRefPtr<SharedInodeVMObject> SharedInodeVMObject::create_with_inode(Inode& inode)
|
||||
{
|
||||
size_t size = inode.size();
|
||||
if (inode.vmobject())
|
||||
return *inode.vmobject();
|
||||
auto vmobject = adopt(*new InodeVMObject(inode, size));
|
||||
vmobject->inode().set_vmobject(*vmobject);
|
||||
if (inode.shared_vmobject())
|
||||
return *inode.shared_vmobject();
|
||||
auto vmobject = adopt(*new SharedInodeVMObject(inode, size));
|
||||
vmobject->inode().set_shared_vmobject(*vmobject);
|
||||
return vmobject;
|
||||
}
|
||||
|
||||
NonnullRefPtr<VMObject> InodeVMObject::clone()
|
||||
NonnullRefPtr<VMObject> SharedInodeVMObject::clone()
|
||||
{
|
||||
return adopt(*new InodeVMObject(*this));
|
||||
return adopt(*new SharedInodeVMObject(*this));
|
||||
}
|
||||
|
||||
InodeVMObject::InodeVMObject(Inode& inode, size_t size)
|
||||
SharedInodeVMObject::SharedInodeVMObject(Inode& inode, size_t size)
|
||||
: VMObject(size)
|
||||
, m_inode(inode)
|
||||
, m_dirty_pages(page_count(), false)
|
||||
{
|
||||
}
|
||||
|
||||
InodeVMObject::InodeVMObject(const InodeVMObject& other)
|
||||
SharedInodeVMObject::SharedInodeVMObject(const SharedInodeVMObject& other)
|
||||
: VMObject(other)
|
||||
, m_inode(other.m_inode)
|
||||
{
|
||||
}
|
||||
|
||||
InodeVMObject::~InodeVMObject()
|
||||
SharedInodeVMObject::~SharedInodeVMObject()
|
||||
{
|
||||
ASSERT(inode().vmobject() == this);
|
||||
ASSERT(inode().shared_vmobject() == this);
|
||||
}
|
||||
|
||||
size_t InodeVMObject::amount_clean() const
|
||||
size_t SharedInodeVMObject::amount_clean() const
|
||||
{
|
||||
size_t count = 0;
|
||||
ASSERT(page_count() == (size_t)m_dirty_pages.size());
|
||||
|
@ -75,7 +75,7 @@ size_t InodeVMObject::amount_clean() const
|
|||
return count * PAGE_SIZE;
|
||||
}
|
||||
|
||||
size_t InodeVMObject::amount_dirty() const
|
||||
size_t SharedInodeVMObject::amount_dirty() const
|
||||
{
|
||||
size_t count = 0;
|
||||
for (size_t i = 0; i < m_dirty_pages.size(); ++i) {
|
||||
|
@ -85,7 +85,7 @@ size_t InodeVMObject::amount_dirty() const
|
|||
return count * PAGE_SIZE;
|
||||
}
|
||||
|
||||
void InodeVMObject::inode_size_changed(Badge<Inode>, size_t old_size, size_t new_size)
|
||||
void SharedInodeVMObject::inode_size_changed(Badge<Inode>, size_t old_size, size_t new_size)
|
||||
{
|
||||
dbg() << "VMObject::inode_size_changed: {" << m_inode->fsid() << ":" << m_inode->index() << "} " << old_size << " -> " << new_size;
|
||||
|
||||
|
@ -102,7 +102,7 @@ void InodeVMObject::inode_size_changed(Badge<Inode>, size_t old_size, size_t new
|
|||
});
|
||||
}
|
||||
|
||||
void InodeVMObject::inode_contents_changed(Badge<Inode>, off_t offset, ssize_t size, const u8* data)
|
||||
void SharedInodeVMObject::inode_contents_changed(Badge<Inode>, off_t offset, ssize_t size, const u8* data)
|
||||
{
|
||||
(void)size;
|
||||
(void)data;
|
||||
|
@ -153,13 +153,13 @@ void InodeVMObject::inode_contents_changed(Badge<Inode>, off_t offset, ssize_t s
|
|||
});
|
||||
}
|
||||
|
||||
int InodeVMObject::release_all_clean_pages()
|
||||
int SharedInodeVMObject::release_all_clean_pages()
|
||||
{
|
||||
LOCKER(m_paging_lock);
|
||||
return release_all_clean_pages_impl();
|
||||
}
|
||||
|
||||
int InodeVMObject::release_all_clean_pages_impl()
|
||||
int SharedInodeVMObject::release_all_clean_pages_impl()
|
||||
{
|
||||
int count = 0;
|
||||
InterruptDisabler disabler;
|
||||
|
@ -175,20 +175,20 @@ int InodeVMObject::release_all_clean_pages_impl()
|
|||
return count;
|
||||
}
|
||||
|
||||
u32 InodeVMObject::writable_mappings() const
|
||||
u32 SharedInodeVMObject::writable_mappings() const
|
||||
{
|
||||
u32 count = 0;
|
||||
const_cast<InodeVMObject&>(*this).for_each_region([&](auto& region) {
|
||||
const_cast<SharedInodeVMObject&>(*this).for_each_region([&](auto& region) {
|
||||
if (region.is_writable())
|
||||
++count;
|
||||
});
|
||||
return count;
|
||||
}
|
||||
|
||||
u32 InodeVMObject::executable_mappings() const
|
||||
u32 SharedInodeVMObject::executable_mappings() const
|
||||
{
|
||||
u32 count = 0;
|
||||
const_cast<InodeVMObject&>(*this).for_each_region([&](auto& region) {
|
||||
const_cast<SharedInodeVMObject&>(*this).for_each_region([&](auto& region) {
|
||||
if (region.is_executable())
|
||||
++count;
|
||||
});
|
|
@ -32,11 +32,11 @@
|
|||
|
||||
namespace Kernel {
|
||||
|
||||
class InodeVMObject final : public VMObject {
|
||||
class SharedInodeVMObject final : public VMObject {
|
||||
public:
|
||||
virtual ~InodeVMObject() override;
|
||||
virtual ~SharedInodeVMObject() override;
|
||||
|
||||
static NonnullRefPtr<InodeVMObject> create_with_inode(Inode&);
|
||||
static NonnullRefPtr<SharedInodeVMObject> create_with_inode(Inode&);
|
||||
virtual NonnullRefPtr<VMObject> clone() override;
|
||||
|
||||
Inode& inode() { return *m_inode; }
|
||||
|
@ -54,12 +54,12 @@ public:
|
|||
u32 executable_mappings() const;
|
||||
|
||||
private:
|
||||
explicit InodeVMObject(Inode&, size_t);
|
||||
explicit InodeVMObject(const InodeVMObject&);
|
||||
explicit SharedInodeVMObject(Inode&, size_t);
|
||||
explicit SharedInodeVMObject(const SharedInodeVMObject&);
|
||||
|
||||
InodeVMObject& operator=(const InodeVMObject&) = delete;
|
||||
InodeVMObject& operator=(InodeVMObject&&) = delete;
|
||||
InodeVMObject(InodeVMObject&&) = delete;
|
||||
SharedInodeVMObject& operator=(const SharedInodeVMObject&) = delete;
|
||||
SharedInodeVMObject& operator=(SharedInodeVMObject&&) = delete;
|
||||
SharedInodeVMObject(SharedInodeVMObject&&) = delete;
|
||||
|
||||
virtual bool is_inode() const override { return true; }
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue