diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/resource_limit.cpp | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/resource_limit.h | 11 |
3 files changed, 6 insertions, 14 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 6baeb3494..f4339a5cd 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -115,7 +115,7 @@ struct KernelCore::Impl { | |||
| 115 | 115 | ||
| 116 | // Creates the default system resource limit | 116 | // Creates the default system resource limit |
| 117 | void InitializeSystemResourceLimit(KernelCore& kernel) { | 117 | void InitializeSystemResourceLimit(KernelCore& kernel) { |
| 118 | system_resource_limit = ResourceLimit::Create(kernel, "System"); | 118 | system_resource_limit = ResourceLimit::Create(kernel); |
| 119 | 119 | ||
| 120 | // If setting the default system values fails, then something seriously wrong has occurred. | 120 | // If setting the default system values fails, then something seriously wrong has occurred. |
| 121 | ASSERT(system_resource_limit->SetLimitValue(ResourceType::PhysicalMemory, 0x200000000) | 121 | ASSERT(system_resource_limit->SetLimitValue(ResourceType::PhysicalMemory, 0x200000000) |
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp index 2f9695005..173f69915 100644 --- a/src/core/hle/kernel/resource_limit.cpp +++ b/src/core/hle/kernel/resource_limit.cpp | |||
| @@ -16,11 +16,8 @@ constexpr std::size_t ResourceTypeToIndex(ResourceType type) { | |||
| 16 | ResourceLimit::ResourceLimit(KernelCore& kernel) : Object{kernel} {} | 16 | ResourceLimit::ResourceLimit(KernelCore& kernel) : Object{kernel} {} |
| 17 | ResourceLimit::~ResourceLimit() = default; | 17 | ResourceLimit::~ResourceLimit() = default; |
| 18 | 18 | ||
| 19 | SharedPtr<ResourceLimit> ResourceLimit::Create(KernelCore& kernel, std::string name) { | 19 | SharedPtr<ResourceLimit> ResourceLimit::Create(KernelCore& kernel) { |
| 20 | SharedPtr<ResourceLimit> resource_limit(new ResourceLimit(kernel)); | 20 | return new ResourceLimit(kernel); |
| 21 | |||
| 22 | resource_limit->name = std::move(name); | ||
| 23 | return resource_limit; | ||
| 24 | } | 21 | } |
| 25 | 22 | ||
| 26 | s64 ResourceLimit::GetCurrentResourceValue(ResourceType resource) const { | 23 | s64 ResourceLimit::GetCurrentResourceValue(ResourceType resource) const { |
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h index 59dc11c22..70e09858a 100644 --- a/src/core/hle/kernel/resource_limit.h +++ b/src/core/hle/kernel/resource_limit.h | |||
| @@ -31,16 +31,14 @@ constexpr bool IsValidResourceType(ResourceType type) { | |||
| 31 | 31 | ||
| 32 | class ResourceLimit final : public Object { | 32 | class ResourceLimit final : public Object { |
| 33 | public: | 33 | public: |
| 34 | /** | 34 | /// Creates a resource limit object. |
| 35 | * Creates a resource limit object. | 35 | static SharedPtr<ResourceLimit> Create(KernelCore& kernel); |
| 36 | */ | ||
| 37 | static SharedPtr<ResourceLimit> Create(KernelCore& kernel, std::string name = "Unknown"); | ||
| 38 | 36 | ||
| 39 | std::string GetTypeName() const override { | 37 | std::string GetTypeName() const override { |
| 40 | return "ResourceLimit"; | 38 | return "ResourceLimit"; |
| 41 | } | 39 | } |
| 42 | std::string GetName() const override { | 40 | std::string GetName() const override { |
| 43 | return name; | 41 | return GetTypeName(); |
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | static const HandleType HANDLE_TYPE = HandleType::ResourceLimit; | 44 | static const HandleType HANDLE_TYPE = HandleType::ResourceLimit; |
| @@ -95,9 +93,6 @@ private: | |||
| 95 | ResourceArray limits{}; | 93 | ResourceArray limits{}; |
| 96 | /// Current resource limit values. | 94 | /// Current resource limit values. |
| 97 | ResourceArray values{}; | 95 | ResourceArray values{}; |
| 98 | |||
| 99 | /// Name of resource limit object. | ||
| 100 | std::string name; | ||
| 101 | }; | 96 | }; |
| 102 | 97 | ||
| 103 | } // namespace Kernel | 98 | } // namespace Kernel |