From 1ed1ce9506e65f76fe5236194516f23d662bba0b Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Sun, 5 May 2024 17:16:00 +0100 Subject: internal: new shared_ptr and weak_ptr implementation (#5883) moves std::shared_ptrs to a new implementation Advantages: - you can dereference a weak_ptr directly. This will obviously segfault on a nullptr deref if it's expired. - this is useful to avoid the .lock() hell where we are 100% sure the pointer _should_ be valid. (and if it isn't, it should throw.) - weak_ptrs are still valid while the SP is being destroyed. - reasoning: while an object (e.g. CWindow) is being destroyed, its `weak_ptr self` should be accessible (the sp is still alive, and so is CWindow), but it's not because by stl it's already expired (to prevent resurrection) - this impl solves it differently. w_p is expired, but can still be dereferenced and used. Creating `s_p`s is not possible anymore, though. - this is useful in destructors and callbacks. --- src/managers/HookSystemManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/managers/HookSystemManager.cpp') diff --git a/src/managers/HookSystemManager.cpp b/src/managers/HookSystemManager.cpp index 11007f1a..a1920863 100644 --- a/src/managers/HookSystemManager.cpp +++ b/src/managers/HookSystemManager.cpp @@ -7,16 +7,16 @@ CHookSystemManager::CHookSystemManager() { } // returns the pointer to the function -std::shared_ptr CHookSystemManager::hookDynamic(const std::string& event, HOOK_CALLBACK_FN fn, HANDLE handle) { - std::shared_ptr hookFN = std::make_shared(fn); +SP CHookSystemManager::hookDynamic(const std::string& event, HOOK_CALLBACK_FN fn, HANDLE handle) { + SP hookFN = makeShared(fn); m_mRegisteredHooks[event].emplace_back(SCallbackFNPtr{.fn = hookFN, .handle = handle}); return hookFN; } -void CHookSystemManager::unhook(std::shared_ptr fn) { +void CHookSystemManager::unhook(SP fn) { for (auto& [k, v] : m_mRegisteredHooks) { std::erase_if(v, [&](const auto& other) { - std::shared_ptr fn_ = other.fn.lock(); + SP fn_ = other.fn.lock(); return fn_.get() == fn.get(); }); @@ -37,7 +37,7 @@ void CHookSystemManager::emit(std::vector* const callbacks, SCal if (!cb.handle) { // we don't guard hl hooks - if (std::shared_ptr fn = cb.fn.lock()) + if (SP fn = cb.fn.lock()) (*fn)(fn.get(), info, data); else needsDeadCleanup = true; @@ -51,7 +51,7 @@ void CHookSystemManager::emit(std::vector* const callbacks, SCal try { if (!setjmp(m_jbHookFaultJumpBuf)) { - if (std::shared_ptr fn = cb.fn.lock()) + if (SP fn = cb.fn.lock()) (*fn)(fn.get(), info, data); else needsDeadCleanup = true; -- cgit v1.2.3