mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 11:17:44 +00:00
Kernel: Rename "vmo" to "vmobject" everywhere
This commit is contained in:
parent
e5500e2a22
commit
e25ade7579
12 changed files with 54 additions and 54 deletions
|
@ -79,14 +79,14 @@ void Inode::will_be_destroyed()
|
|||
|
||||
void Inode::inode_contents_changed(off_t offset, ssize_t size, const u8* data)
|
||||
{
|
||||
if (m_vmo)
|
||||
m_vmo->inode_contents_changed({}, offset, size, data);
|
||||
if (m_vmobject)
|
||||
m_vmobject->inode_contents_changed({}, offset, size, data);
|
||||
}
|
||||
|
||||
void Inode::inode_size_changed(size_t old_size, size_t new_size)
|
||||
{
|
||||
if (m_vmo)
|
||||
m_vmo->inode_size_changed({}, old_size, new_size);
|
||||
if (m_vmobject)
|
||||
m_vmobject->inode_size_changed({}, old_size, new_size);
|
||||
}
|
||||
|
||||
int Inode::set_atime(time_t)
|
||||
|
@ -116,7 +116,7 @@ int Inode::decrement_link_count()
|
|||
|
||||
void Inode::set_vmo(VMObject& vmo)
|
||||
{
|
||||
m_vmo = vmo.make_weak_ptr();
|
||||
m_vmobject = vmo.make_weak_ptr();
|
||||
}
|
||||
|
||||
bool Inode::bind_socket(LocalSocket& socket)
|
||||
|
|
|
@ -72,8 +72,8 @@ public:
|
|||
void will_be_destroyed();
|
||||
|
||||
void set_vmo(VMObject&);
|
||||
InodeVMObject* vmo() { return m_vmo.ptr(); }
|
||||
const InodeVMObject* vmo() const { return m_vmo.ptr(); }
|
||||
InodeVMObject* vmobject() { return m_vmobject.ptr(); }
|
||||
const InodeVMObject* vmobject() const { return m_vmobject.ptr(); }
|
||||
|
||||
static void sync();
|
||||
|
||||
|
@ -95,7 +95,7 @@ protected:
|
|||
private:
|
||||
FS& m_fs;
|
||||
unsigned m_index { 0 };
|
||||
WeakPtr<InodeVMObject> m_vmo;
|
||||
WeakPtr<InodeVMObject> m_vmobject;
|
||||
RefPtr<LocalSocket> m_socket;
|
||||
HashTable<InodeWatcher*> m_watchers;
|
||||
bool m_metadata_dirty { false };
|
||||
|
|
|
@ -417,11 +417,11 @@ Optional<KBuffer> procfs$pid_vmo(InodeIdentifier identifier)
|
|||
region.size(),
|
||||
region.name().characters());
|
||||
builder.appendf("VMO: %s @ %x(%u)\n",
|
||||
region.vmo().is_anonymous() ? "anonymous" : "file-backed",
|
||||
®ion.vmo(),
|
||||
region.vmo().ref_count());
|
||||
for (size_t i = 0; i < region.vmo().page_count(); ++i) {
|
||||
auto& physical_page = region.vmo().physical_pages()[i];
|
||||
region.vmobject().is_anonymous() ? "anonymous" : "file-backed",
|
||||
®ion.vmobject(),
|
||||
region.vmobject().ref_count());
|
||||
for (size_t i = 0; i < region.vmobject().page_count(); ++i) {
|
||||
auto& physical_page = region.vmobject().physical_pages()[i];
|
||||
builder.appendf("P%x%s(%u) ",
|
||||
physical_page ? physical_page->paddr().get() : 0,
|
||||
region.should_cow(i) ? "!" : "",
|
||||
|
|
|
@ -54,12 +54,12 @@ SharedMemory::~SharedMemory()
|
|||
KResult SharedMemory::truncate(int length)
|
||||
{
|
||||
if (!length) {
|
||||
m_vmo = nullptr;
|
||||
m_vmobject = nullptr;
|
||||
return KSuccess;
|
||||
}
|
||||
|
||||
if (!m_vmo) {
|
||||
m_vmo = AnonymousVMObject::create_with_size(length);
|
||||
if (!m_vmobject) {
|
||||
m_vmobject = AnonymousVMObject::create_with_size(length);
|
||||
return KSuccess;
|
||||
}
|
||||
|
||||
|
@ -91,7 +91,7 @@ int SharedMemory::write(FileDescription&, const u8* data, int data_size)
|
|||
|
||||
KResultOr<Region*> SharedMemory::mmap(Process& process, FileDescription&, VirtualAddress vaddr, size_t offset, size_t size, int prot)
|
||||
{
|
||||
if (!vmo())
|
||||
if (!vmobject())
|
||||
return KResult(-ENODEV);
|
||||
return process.allocate_region_with_vmo(vaddr, size, *vmo(), offset, name(), prot);
|
||||
return process.allocate_region_with_vmo(vaddr, size, *vmobject(), offset, name(), prot);
|
||||
}
|
||||
|
|
|
@ -17,8 +17,8 @@ public:
|
|||
|
||||
const String& name() const { return m_name; }
|
||||
virtual KResult truncate(off_t) override;
|
||||
AnonymousVMObject* vmo() { return m_vmo.ptr(); }
|
||||
const AnonymousVMObject* vmo() const { return m_vmo.ptr(); }
|
||||
AnonymousVMObject* vmobject() { return m_vmobject.ptr(); }
|
||||
const AnonymousVMObject* vmobject() const { return m_vmobject.ptr(); }
|
||||
uid_t uid() const { return m_uid; }
|
||||
gid_t gid() const { return m_gid; }
|
||||
|
||||
|
@ -39,5 +39,5 @@ private:
|
|||
uid_t m_uid { 0 };
|
||||
gid_t m_gid { 0 };
|
||||
mode_t m_mode { 0 };
|
||||
RefPtr<AnonymousVMObject> m_vmo;
|
||||
RefPtr<AnonymousVMObject> m_vmobject;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue