diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-12-04 00:29:15 -0500 | 
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-12-04 01:50:30 -0500 | 
| commit | 312690b4509a6e5c5e97b667136aea7693e52ca0 (patch) | |
| tree | 81c05c9ff48b02023c713d5ed57fc6799e27b274 /src/core | |
| parent | adc4d332fc1a4054b80cfd575025351b970da689 (diff) | |
kernel/svc: Implement the resource limit svcGetInfo option
Allows a process to register the resource limit as part of its handle
table.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/handle_table.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.h | 9 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 29 | 
4 files changed, 34 insertions, 9 deletions
| diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h index e3f3e3fb8..6b7927fd8 100644 --- a/src/core/hle/kernel/handle_table.h +++ b/src/core/hle/kernel/handle_table.h @@ -13,6 +13,7 @@  namespace Kernel {  enum KernelHandle : Handle { +    InvalidHandle = 0,      CurrentThread = 0xFFFF8000,      CurrentProcess = 0xFFFF8001,  }; diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 7ca538401..4ecb8c926 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -44,6 +44,10 @@ SharedPtr<Process> Process::Create(KernelCore& kernel, std::string&& name) {      return process;  } +SharedPtr<ResourceLimit> Process::GetResourceLimit() const { +    return resource_limit; +} +  void Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata) {      program_id = metadata.GetTitleID();      is_64bit_process = metadata.Is64BitProgram(); diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index ada845c7f..49345aa66 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -171,14 +171,7 @@ public:      }      /// Gets the resource limit descriptor for this process -    ResourceLimit& GetResourceLimit() { -        return *resource_limit; -    } - -    /// Gets the resource limit descriptor for this process -    const ResourceLimit& GetResourceLimit() const { -        return *resource_limit; -    } +    SharedPtr<ResourceLimit> GetResourceLimit() const;      /// Gets the default CPU ID for this process      u8 GetDefaultProcessorID() const { diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 948989b31..b022a7bc5 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -663,7 +663,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)          TotalMemoryUsage = 6,          TotalHeapUsage = 7,          IsCurrentProcessBeingDebugged = 8, -        ResourceHandleLimit = 9, +        RegisterResourceLimit = 9,          IdleTickCount = 10,          RandomEntropy = 11,          PerformanceCounter = 0xF0000002, @@ -787,6 +787,33 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)          *result = 0;          return RESULT_SUCCESS; +    case GetInfoType::RegisterResourceLimit: { +        if (handle != 0) { +            return ERR_INVALID_HANDLE; +        } + +        if (info_sub_id != 0) { +            return ERR_INVALID_COMBINATION; +        } + +        Process* const current_process = Core::CurrentProcess(); +        HandleTable& handle_table = current_process->GetHandleTable(); +        const auto resource_limit = current_process->GetResourceLimit(); +        if (!resource_limit) { +            *result = KernelHandle::InvalidHandle; +            // Yes, the kernel considers this a successful operation. +            return RESULT_SUCCESS; +        } + +        const auto table_result = handle_table.Create(resource_limit); +        if (table_result.Failed()) { +            return table_result.Code(); +        } + +        *result = *table_result; +        return RESULT_SUCCESS; +    } +      case GetInfoType::RandomEntropy:          if (handle != 0) {              LOG_ERROR(Kernel_SVC, "Process Handle is non zero, expected 0 result but got {:016X}", | 
