Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Add physical memory info to /proc/{pid}/meminfo

Browse Source
This commit is contained in:
Bananymous
2023-09-30 22:11:45 +03:00
parent c5119cda97
commit 5ee3506474
12 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/kernel/Memory/FileBackedRegion.cpp
View File

@@ -85,7 +85,7 @@ namespace Kernel
}
}
BAN::ErrorOr<bool> FileBackedRegion::allocate_page_containing(vaddr_t address)
BAN::ErrorOr<bool> FileBackedRegion::allocate_page_containing_impl(vaddr_t address)
{
ASSERT(contains(address));

2
kernel/kernel/Memory/MemoryBackedRegion.cpp
View File

@@ -38,7 +38,7 @@ namespace Kernel
}
}
BAN::ErrorOr<bool> MemoryBackedRegion::allocate_page_containing(vaddr_t address)
BAN::ErrorOr<bool> MemoryBackedRegion::allocate_page_containing_impl(vaddr_t address)
{
ASSERT(m_type == Type::PRIVATE);

8
kernel/kernel/Memory/MemoryRegion.cpp
View File

@@ -47,4 +47,12 @@ namespace Kernel
return true;
}
BAN::ErrorOr<bool> MemoryRegion::allocate_page_containing(vaddr_t address)
{
auto ret = allocate_page_containing_impl(address);
if (!ret.is_error() && ret.value())
m_physical_page_count++;
return ret;
}
}

12
kernel/kernel/Process.cpp
View File

@@ -257,14 +257,24 @@ namespace Kernel
LockGuard _(m_lock);
out->page_size = PAGE_SIZE;
out->virt_pages = 0;
out->phys_pages = 0;
for (auto* thread : m_threads)
{
out->virt_pages += thread->virtual_page_count();
out->phys_pages += thread->physical_page_count();
}
for (auto& region : m_mapped_regions)
{
out->virt_pages += region->virtual_page_count();
out->phys_pages += region->physical_page_count();
}
if (m_loadable_elf)
{
out->virt_pages += m_loadable_elf->virtual_page_count();
out->phys_pages += m_loadable_elf->physical_page_count();
}
}
BAN::ErrorOr<long> Process::sys_exit(int status)