From c44da848694aa6594dd39698865395a2c7f4e395 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 17 Oct 2023 11:10:09 -0700 Subject: [PATCH] pm: adjust resource limit function names --- .../stratosphere/pm/impl/pm_debug_monitor_interface.hpp | 2 +- .../stratosphere/pm/impl/pm_information_interface.hpp | 4 ++-- .../include/stratosphere/pm/pm_info_api.hpp | 4 ++-- .../libstratosphere/include/stratosphere/pm/pm_types.hpp | 2 +- libraries/libstratosphere/source/pm/pm_info_api.cpp | 8 ++++---- stratosphere/pm/source/impl/pm_process_manager.cpp | 8 ++++---- stratosphere/pm/source/impl/pm_process_manager.hpp | 4 ++-- stratosphere/pm/source/impl/pm_resource_manager.cpp | 8 ++++---- stratosphere/pm/source/impl/pm_resource_manager.hpp | 6 +++--- stratosphere/pm/source/pm_info_service.cpp | 8 ++++---- stratosphere/pm/source/pm_info_service.hpp | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/pm/impl/pm_debug_monitor_interface.hpp b/libraries/libstratosphere/include/stratosphere/pm/impl/pm_debug_monitor_interface.hpp index f9e063baa..7c9676f86 100644 --- a/libraries/libstratosphere/include/stratosphere/pm/impl/pm_debug_monitor_interface.hpp +++ b/libraries/libstratosphere/include/stratosphere/pm/impl/pm_debug_monitor_interface.hpp @@ -27,7 +27,7 @@ AMS_SF_METHOD_INFO(C, H, 4, Result, GetApplicationProcessId, (sf::Out out), (out)) \ AMS_SF_METHOD_INFO(C, H, 5, Result, HookToCreateApplicationProcess, (sf::OutCopyHandle out_hook), (out_hook)) \ AMS_SF_METHOD_INFO(C, H, 6, Result, ClearHook, (u32 which), (which), hos::Version_6_0_0) \ - AMS_SF_METHOD_INFO(C, H, 7, Result, GetProgramId, (sf::Out out, os::ProcessId process_id), (out, process_id)) \ + AMS_SF_METHOD_INFO(C, H, 7, Result, GetProgramId, (sf::Out out, os::ProcessId process_id), (out, process_id)) \ AMS_SF_METHOD_INFO(C, H, 65000, Result, AtmosphereGetProcessInfo, (sf::OutCopyHandle out_process_handle, sf::Out out_loc, sf::Out out_status, os::ProcessId process_id), (out_process_handle, out_loc, out_status, process_id)) \ AMS_SF_METHOD_INFO(C, H, 65001, Result, AtmosphereGetCurrentLimitInfo, (sf::Out out_cur_val, sf::Out out_lim_val, u32 group, u32 resource), (out_cur_val, out_lim_val, group, resource)) diff --git a/libraries/libstratosphere/include/stratosphere/pm/impl/pm_information_interface.hpp b/libraries/libstratosphere/include/stratosphere/pm/impl/pm_information_interface.hpp index 35f5d7089..6eeda3216 100644 --- a/libraries/libstratosphere/include/stratosphere/pm/impl/pm_information_interface.hpp +++ b/libraries/libstratosphere/include/stratosphere/pm/impl/pm_information_interface.hpp @@ -21,8 +21,8 @@ #define AMS_PM_I_INFORMATION_INTERFACE_INTERFACE_INFO(C, H) \ AMS_SF_METHOD_INFO(C, H, 0, Result, GetProgramId, (sf::Out out, os::ProcessId process_id), (out, process_id)) \ - AMS_SF_METHOD_INFO(C, H, 1, Result, GetAppletCurrentResourceLimitValues, (sf::Out out), (out)) \ - AMS_SF_METHOD_INFO(C, H, 2, Result, GetAppletPeakResourceLimitValues, (sf::Out out), (out)) \ + AMS_SF_METHOD_INFO(C, H, 1, Result, GetAppletResourceLimitCurrentValue, (sf::Out out), (out)) \ + AMS_SF_METHOD_INFO(C, H, 2, Result, GetAppletResourceLimitPeakValue, (sf::Out out), (out)) \ AMS_SF_METHOD_INFO(C, H, 65000, Result, AtmosphereGetProcessId, (sf::Out out, ncm::ProgramId program_id), (out, program_id)) \ AMS_SF_METHOD_INFO(C, H, 65001, Result, AtmosphereHasLaunchedBootProgram, (sf::Out out, ncm::ProgramId program_id), (out, program_id)) \ AMS_SF_METHOD_INFO(C, H, 65002, Result, AtmosphereGetProcessInfo, (sf::Out out_loc, sf::Out out_status, os::ProcessId process_id), (out_loc, out_status, process_id)) diff --git a/libraries/libstratosphere/include/stratosphere/pm/pm_info_api.hpp b/libraries/libstratosphere/include/stratosphere/pm/pm_info_api.hpp index c771eb33f..484c4fa7e 100644 --- a/libraries/libstratosphere/include/stratosphere/pm/pm_info_api.hpp +++ b/libraries/libstratosphere/include/stratosphere/pm/pm_info_api.hpp @@ -29,8 +29,8 @@ namespace ams::pm::info { Result GetProcessId(os::ProcessId *out_process_id, ncm::ProgramId program_id); Result HasLaunchedBootProgram(bool *out, ncm::ProgramId program_id); - Result GetAppletCurrentResourceLimitValues(pm::ResourceLimitValues *out); - Result GetAppletPeakResourceLimitValues(pm::ResourceLimitValues *out); + Result GetAppletResourceLimitCurrentValue(pm::ResourceLimitValue *out); + Result GetAppletResourceLimitPeakValue(pm::ResourceLimitValue *out); Result GetProcessInfo(ncm::ProgramLocation *out_loc, cfg::OverrideStatus *out_status, os::ProcessId process_id); diff --git a/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp b/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp index 9266302fc..0fb6e3c87 100644 --- a/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp +++ b/libraries/libstratosphere/include/stratosphere/pm/pm_types.hpp @@ -52,7 +52,7 @@ namespace ams::pm { LaunchFlagsDeprecated_SignalOnStart = (1 << 5), }; - struct ResourceLimitValues { + struct ResourceLimitValue { u64 physical_memory; u32 thread_count; u32 event_count; diff --git a/libraries/libstratosphere/source/pm/pm_info_api.cpp b/libraries/libstratosphere/source/pm/pm_info_api.cpp index 182c09c8a..9fdf4a865 100644 --- a/libraries/libstratosphere/source/pm/pm_info_api.cpp +++ b/libraries/libstratosphere/source/pm/pm_info_api.cpp @@ -28,13 +28,13 @@ namespace ams::pm::info { R_RETURN(pminfoAtmosphereGetProcessId(reinterpret_cast(out_process_id), static_cast(program_id))); } - Result GetAppletCurrentResourceLimitValues(pm::ResourceLimitValues *out) { - static_assert(sizeof(pm::ResourceLimitValues) == sizeof(::PmResourceLimitValues)); + Result GetAppletResourceLimitCurrentValue(pm::ResourceLimitValue *out) { + static_assert(sizeof(pm::ResourceLimitValue) == sizeof(::PmResourceLimitValues)); R_RETURN(pminfoGetAppletCurrentResourceLimitValues(reinterpret_cast(out))); } - Result GetAppletPeakResourceLimitValues(pm::ResourceLimitValues *out) { - static_assert(sizeof(pm::ResourceLimitValues) == sizeof(::PmResourceLimitValues)); + Result GetAppletResourceLimitPeakValue(pm::ResourceLimitValue *out) { + static_assert(sizeof(pm::ResourceLimitValue) == sizeof(::PmResourceLimitValues)); R_RETURN(pminfoGetAppletPeakResourceLimitValues(reinterpret_cast(out))); } diff --git a/stratosphere/pm/source/impl/pm_process_manager.cpp b/stratosphere/pm/source/impl/pm_process_manager.cpp index db0648acc..036814f66 100644 --- a/stratosphere/pm/source/impl/pm_process_manager.cpp +++ b/stratosphere/pm/source/impl/pm_process_manager.cpp @@ -719,12 +719,12 @@ namespace ams::pm::impl { R_RETURN(resource::BoostSystemThreadResourceLimit()); } - Result GetAppletCurrentResourceLimitValues(pm::ResourceLimitValues *out) { - R_RETURN(resource::GetCurrentResourceLimitValues(ResourceLimitGroup_Applet, out)); + Result GetAppletResourceLimitCurrentValue(pm::ResourceLimitValue *out) { + R_RETURN(resource::GetResourceLimitCurrentValue(ResourceLimitGroup_Applet, out)); } - Result GetAppletPeakResourceLimitValues(pm::ResourceLimitValues *out) { - R_RETURN(resource::GetPeakResourceLimitValues(ResourceLimitGroup_Applet, out)); + Result GetAppletResourceLimitPeakValue(pm::ResourceLimitValue *out) { + R_RETURN(resource::GetResourceLimitPeakValue(ResourceLimitGroup_Applet, out)); } Result AtmosphereGetCurrentLimitInfo(s64 *out_cur_val, s64 *out_lim_val, u32 group, u32 resource) { diff --git a/stratosphere/pm/source/impl/pm_process_manager.hpp b/stratosphere/pm/source/impl/pm_process_manager.hpp index 83ccc7a85..b12e91651 100644 --- a/stratosphere/pm/source/impl/pm_process_manager.hpp +++ b/stratosphere/pm/source/impl/pm_process_manager.hpp @@ -52,8 +52,8 @@ namespace ams::pm::impl { Result BoostSystemMemoryResourceLimit(u64 boost_size); Result BoostApplicationThreadResourceLimit(); Result BoostSystemThreadResourceLimit(); - Result GetAppletCurrentResourceLimitValues(pm::ResourceLimitValues *out); - Result GetAppletPeakResourceLimitValues(pm::ResourceLimitValues *out); + Result GetAppletResourceLimitCurrentValue(pm::ResourceLimitValue *out); + Result GetAppletResourceLimitPeakValue(pm::ResourceLimitValue *out); Result AtmosphereGetCurrentLimitInfo(s64 *out_cur_val, s64 *out_lim_val, u32 group, u32 resource); Result BoostSystemMemoryResourceLimitForMitm(u64 boost_size); diff --git a/stratosphere/pm/source/impl/pm_resource_manager.cpp b/stratosphere/pm/source/impl/pm_resource_manager.cpp index 6c5805b5d..fc07a5daa 100644 --- a/stratosphere/pm/source/impl/pm_resource_manager.cpp +++ b/stratosphere/pm/source/impl/pm_resource_manager.cpp @@ -202,7 +202,7 @@ namespace ams::pm::resource { } template - ALWAYS_INLINE Result GetResourceLimitValuesImpl(ResourceLimitGroup group, pm::ResourceLimitValues *out) { + ALWAYS_INLINE Result GetResourceLimitValuesImpl(ResourceLimitGroup group, pm::ResourceLimitValue *out) { /* Sanity check group. */ AMS_ABORT_UNLESS(group < ResourceLimitGroup_Count); @@ -451,15 +451,15 @@ namespace ams::pm::resource { } } - Result GetCurrentResourceLimitValues(ResourceLimitGroup group, pm::ResourceLimitValues *out) { + Result GetResourceLimitCurrentValue(ResourceLimitGroup group, pm::ResourceLimitValue *out) { R_RETURN(GetResourceLimitValuesImpl<::ams::svc::GetResourceLimitCurrentValue>(group, out)); } - Result GetPeakResourceLimitValues(ResourceLimitGroup group, pm::ResourceLimitValues *out) { + Result GetResourceLimitPeakValue(ResourceLimitGroup group, pm::ResourceLimitValue *out) { R_RETURN(GetResourceLimitValuesImpl<::ams::svc::GetResourceLimitPeakValue>(group, out)); } - Result GetLimitResourceLimitValues(ResourceLimitGroup group, pm::ResourceLimitValues *out) { + Result GetResourceLimitLimitValue(ResourceLimitGroup group, pm::ResourceLimitValue *out) { R_RETURN(GetResourceLimitValuesImpl<::ams::svc::GetResourceLimitLimitValue>(group, out)); } diff --git a/stratosphere/pm/source/impl/pm_resource_manager.hpp b/stratosphere/pm/source/impl/pm_resource_manager.hpp index 029458203..b6f5605af 100644 --- a/stratosphere/pm/source/impl/pm_resource_manager.hpp +++ b/stratosphere/pm/source/impl/pm_resource_manager.hpp @@ -31,9 +31,9 @@ namespace ams::pm::resource { void WaitResourceAvailable(const ldr::ProgramInfo *info); - Result GetCurrentResourceLimitValues(ResourceLimitGroup group, pm::ResourceLimitValues *out); - Result GetPeakResourceLimitValues(ResourceLimitGroup group, pm::ResourceLimitValues *out); - Result GetLimitResourceLimitValues(ResourceLimitGroup group, pm::ResourceLimitValues *out); + Result GetResourceLimitCurrentValue(ResourceLimitGroup group, pm::ResourceLimitValue *out); + Result GetResourceLimitPeakValue(ResourceLimitGroup group, pm::ResourceLimitValue *out); + Result GetResourceLimitLimitValue(ResourceLimitGroup group, pm::ResourceLimitValue *out); Result GetResourceLimitValues(s64 *out_cur, s64 *out_lim, ResourceLimitGroup group, svc::LimitableResource resource); diff --git a/stratosphere/pm/source/pm_info_service.cpp b/stratosphere/pm/source/pm_info_service.cpp index 26c7f2781..55b308fce 100644 --- a/stratosphere/pm/source/pm_info_service.cpp +++ b/stratosphere/pm/source/pm_info_service.cpp @@ -33,12 +33,12 @@ namespace ams::pm { R_RETURN(impl::GetProgramId(out.GetPointer(), process_id)); } - Result InformationService::GetAppletCurrentResourceLimitValues(sf::Out out) { - R_RETURN(impl::GetAppletCurrentResourceLimitValues(out.GetPointer())); + Result InformationService::GetAppletResourceLimitCurrentValue(sf::Out out) { + R_RETURN(impl::GetAppletResourceLimitCurrentValue(out.GetPointer())); } - Result InformationService::GetAppletPeakResourceLimitValues(sf::Out out) { - R_RETURN(impl::GetAppletPeakResourceLimitValues(out.GetPointer())); + Result InformationService::GetAppletResourceLimitPeakValue(sf::Out out) { + R_RETURN(impl::GetAppletResourceLimitPeakValue(out.GetPointer())); } /* Atmosphere extension commands. */ diff --git a/stratosphere/pm/source/pm_info_service.hpp b/stratosphere/pm/source/pm_info_service.hpp index 1f8010f11..1fd892542 100644 --- a/stratosphere/pm/source/pm_info_service.hpp +++ b/stratosphere/pm/source/pm_info_service.hpp @@ -22,8 +22,8 @@ namespace ams::pm { public: /* Actual command implementations. */ Result GetProgramId(sf::Out out, os::ProcessId process_id); - Result GetAppletCurrentResourceLimitValues(sf::Out out); - Result GetAppletPeakResourceLimitValues(sf::Out out); + Result GetAppletResourceLimitCurrentValue(sf::Out out); + Result GetAppletResourceLimitPeakValue(sf::Out out); /* Atmosphere extension commands. */ Result AtmosphereGetProcessId(sf::Out out, ncm::ProgramId program_id);