ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Refactor no_idle_kick to not store the address of the tunables. (#3363)

Browse Source 
* Refactor no_idle_kick to not store the address of the tunables.
* Added sanity checks to the tunable pointers.
This commit is contained in:
gir489 2024-07-17 08:13:10 -04:00 committed by GitHub
parent 2f9194e49a
commit df102c7ae2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/backend/looped/tunables/no_idle_kick.cpp
View File

@ -1,7 +1,7 @@
#include "backend/looped_command.hpp" #include "backend/looped_command.hpp"
#include "services/tunables/tunables_service.hpp"
#include "core/scr_globals.hpp" #include "core/scr_globals.hpp"
#include "natives.hpp" #include "natives.hpp"
#include "services/tunables/tunables_service.hpp"
namespace big namespace big
{ {
@ -9,48 +9,47 @@ namespace big
{ {
using looped_command::looped_command; using looped_command::looped_command;
std::array<int*, 8> m_tunables = {nullptr};
std::array<int, 8> m_restore; std::array<int, 8> m_restore;
bool m_ready_to_use; bool m_backed_up;
const std::vector<Hash> m_tunable_hashes = {"IDLEKICK_WARNING1"_J, "IDLEKICK_WARNING2"_J, "IDLEKICK_WARNING3"_J, "IDLEKICK_KICK"_J, "ConstrainedKick_Warning1"_J, "ConstrainedKick_Warning2"_J, "ConstrainedKick_Warning3"_J, "ConstrainedKick_Kick"_J};
virtual void on_tick() override virtual void on_tick() override
{ {
if (!m_ready_to_use) if (!m_backed_up) [[unlikely]]
{ {
m_tunables[0] = g_tunables_service->get_tunable<int*>("IDLEKICK_WARNING1"_J); bool did_fail = false;
m_tunables[1] = g_tunables_service->get_tunable<int*>("IDLEKICK_WARNING2"_J); for (int i = 0; i < m_restore.size(); i++)
m_tunables[2] = g_tunables_service->get_tunable<int*>("IDLEKICK_WARNING3"_J);
m_tunables[3] = g_tunables_service->get_tunable<int*>("IDLEKICK_KICK"_J);
m_tunables[4] = g_tunables_service->get_tunable<int*>("ConstrainedKick_Warning1"_J);
m_tunables[5] = g_tunables_service->get_tunable<int*>("ConstrainedKick_Warning2"_J);
m_tunables[6] = g_tunables_service->get_tunable<int*>("ConstrainedKick_Warning3"_J);
m_tunables[7] = g_tunables_service->get_tunable<int*>("ConstrainedKick_Kick"_J);
// create backup of tunables
m_ready_to_use = true;
for (int i = 0; i < m_restore.size(); ++i)
{ {
if (m_ready_to_use = m_tunables[i]; !m_ready_to_use) if (auto tunable = g_tunables_service->get_tunable<int*>(m_tunable_hashes[i]))
break; {
m_restore[i] = *m_tunables[i]; m_restore[i] = *tunable;
}
} }
else else
{ {
for (const auto& tunable : m_tunables) did_fail = true;
}
}
m_backed_up = !did_fail;
}
else
{ {
if (tunable) for (Hash hash_iter : m_tunable_hashes)
*tunable = INT_MAX; {
if (auto tunable_ptr = g_tunables_service->get_tunable<int*>(hash_iter))
{
*tunable_ptr = INT_MAX;
}
} }
} }
} }
virtual void on_disable() override virtual void on_disable() override
{ {
for (int i = 0; m_ready_to_use && i < m_restore.size(); ++i) if (m_backed_up)
{ {
if (m_tunables[i]) for (int i = 0; i < m_restore.size(); ++i)
*m_tunables[i] = m_restore[i]; *g_tunables_service->get_tunable<int*>(m_tunable_hashes[i]) = m_restore[i];
} }
} }
}; };