Merge pull request #2304 from lioncash/memsize

kernel/process: Report total physical memory used to svcGetInfo slightly better
This commit is contained in:
bunnei 2019-03-30 20:11:17 -04:00 committed by GitHub
commit d9b7bc4474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 9 deletions

View File

@ -5,6 +5,7 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <random> #include <random>
#include "common/alignment.h"
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/core.h" #include "core/core.h"
@ -75,6 +76,10 @@ SharedPtr<ResourceLimit> Process::GetResourceLimit() const {
return resource_limit; return resource_limit;
} }
u64 Process::GetTotalPhysicalMemoryUsed() const {
return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size;
}
ResultCode Process::ClearSignalState() { ResultCode Process::ClearSignalState() {
if (status == ProcessStatus::Exited) { if (status == ProcessStatus::Exited) {
LOG_ERROR(Kernel, "called on a terminated process instance."); LOG_ERROR(Kernel, "called on a terminated process instance.");
@ -107,14 +112,17 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata) {
return handle_table.SetSize(capabilities.GetHandleTableSize()); return handle_table.SetSize(capabilities.GetHandleTableSize());
} }
void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { void Process::Run(VAddr entry_point, s32 main_thread_priority, u64 stack_size) {
// The kernel always ensures that the given stack size is page aligned.
main_thread_stack_size = Common::AlignUp(stack_size, Memory::PAGE_SIZE);
// Allocate and map the main thread stack // Allocate and map the main thread stack
// TODO(bunnei): This is heap area that should be allocated by the kernel and not mapped as part // TODO(bunnei): This is heap area that should be allocated by the kernel and not mapped as part
// of the user address space. // of the user address space.
const VAddr mapping_address = vm_manager.GetTLSIORegionEndAddress() - main_thread_stack_size;
vm_manager vm_manager
.MapMemoryBlock(vm_manager.GetTLSIORegionEndAddress() - stack_size, .MapMemoryBlock(mapping_address, std::make_shared<std::vector<u8>>(main_thread_stack_size),
std::make_shared<std::vector<u8>>(stack_size, 0), 0, stack_size, 0, main_thread_stack_size, MemoryState::Stack)
MemoryState::Stack)
.Unwrap(); .Unwrap();
vm_manager.LogLayout(); vm_manager.LogLayout();
@ -224,6 +232,8 @@ void Process::LoadModule(CodeSet module_, VAddr base_addr) {
MapSegment(module_.RODataSegment(), VMAPermission::Read, MemoryState::CodeData); MapSegment(module_.RODataSegment(), VMAPermission::Read, MemoryState::CodeData);
MapSegment(module_.DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeData); MapSegment(module_.DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeData);
code_memory_size += module_.memory->size();
// Clear instruction cache in CPU JIT // Clear instruction cache in CPU JIT
system.InvalidateCpuInstructionCaches(); system.InvalidateCpuInstructionCaches();
} }

View File

@ -186,6 +186,9 @@ public:
return random_entropy.at(index); return random_entropy.at(index);
} }
/// Retrieves the total physical memory used by this process in bytes.
u64 GetTotalPhysicalMemoryUsed() const;
/// Clears the signaled state of the process if and only if it's signaled. /// Clears the signaled state of the process if and only if it's signaled.
/// ///
/// @pre The process must not be already terminated. If this is called on a /// @pre The process must not be already terminated. If this is called on a
@ -210,7 +213,7 @@ public:
/** /**
* Applies address space changes and launches the process main thread. * Applies address space changes and launches the process main thread.
*/ */
void Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size); void Run(VAddr entry_point, s32 main_thread_priority, u64 stack_size);
/** /**
* Prepares a process for termination by stopping all of its threads * Prepares a process for termination by stopping all of its threads
@ -247,6 +250,12 @@ private:
/// Memory manager for this process. /// Memory manager for this process.
Kernel::VMManager vm_manager; Kernel::VMManager vm_manager;
/// Size of the main thread's stack in bytes.
u64 main_thread_stack_size = 0;
/// Size of the loaded code memory in bytes.
u64 code_memory_size = 0;
/// Current status of the process /// Current status of the process
ProcessStatus status; ProcessStatus status;

View File

@ -709,7 +709,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
HeapRegionBaseAddr = 4, HeapRegionBaseAddr = 4,
HeapRegionSize = 5, HeapRegionSize = 5,
TotalMemoryUsage = 6, TotalMemoryUsage = 6,
TotalHeapUsage = 7, TotalPhysicalMemoryUsed = 7,
IsCurrentProcessBeingDebugged = 8, IsCurrentProcessBeingDebugged = 8,
RegisterResourceLimit = 9, RegisterResourceLimit = 9,
IdleTickCount = 10, IdleTickCount = 10,
@ -745,7 +745,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
case GetInfoType::NewMapRegionBaseAddr: case GetInfoType::NewMapRegionBaseAddr:
case GetInfoType::NewMapRegionSize: case GetInfoType::NewMapRegionSize:
case GetInfoType::TotalMemoryUsage: case GetInfoType::TotalMemoryUsage:
case GetInfoType::TotalHeapUsage: case GetInfoType::TotalPhysicalMemoryUsed:
case GetInfoType::IsVirtualAddressMemoryEnabled: case GetInfoType::IsVirtualAddressMemoryEnabled:
case GetInfoType::PersonalMmHeapUsage: case GetInfoType::PersonalMmHeapUsage:
case GetInfoType::TitleId: case GetInfoType::TitleId:
@ -805,8 +805,8 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
*result = process->VMManager().GetTotalMemoryUsage(); *result = process->VMManager().GetTotalMemoryUsage();
return RESULT_SUCCESS; return RESULT_SUCCESS;
case GetInfoType::TotalHeapUsage: case GetInfoType::TotalPhysicalMemoryUsed:
*result = process->VMManager().GetCurrentHeapSize(); *result = process->GetTotalPhysicalMemoryUsed();
return RESULT_SUCCESS; return RESULT_SUCCESS;
case GetInfoType::IsVirtualAddressMemoryEnabled: case GetInfoType::IsVirtualAddressMemoryEnabled: