Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HookableEvent: Switch to construct on first use #11560

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 28 additions & 15 deletions Source/Core/Common/HookableEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,36 +67,49 @@ class HookableEvent
std::string m_name;
};

struct Storage
{
std::mutex m_mutex;
std::vector<HookImpl*> m_listeners;
};

// We use the "Construct On First Use" idiom to avoid the static initialization order fiasco.
// https://isocpp.org/wiki/faq/ctors#static-init-order
static Storage& GetStorage()
{
static Storage storage;
return storage;
}

static void Remove(HookImpl* handle)
{
auto& storage = GetStorage();
std::lock_guard lock(storage.m_mutex);

std::erase(storage.m_listeners, handle);
}

public:
// Returns a handle that will unregister the listener when destroyed.
static EventHook Register(CallbackType callback, std::string name)
{
std::lock_guard lock(m_mutex);
auto& storage = GetStorage();
std::lock_guard lock(storage.m_mutex);

DEBUG_LOG_FMT(COMMON, "Registering {} handler at {} event hook", name, EventName.value);
auto handle = std::make_unique<HookImpl>(callback, std::move(name));
m_listeners.push_back(handle.get());
storage.m_listeners.push_back(handle.get());
return handle;
}

static void Trigger(const CallbackArgs&... args)
{
std::lock_guard lock(m_mutex);
auto& storage = GetStorage();
std::lock_guard lock(storage.m_mutex);

for (const auto& handle : m_listeners)
for (const auto& handle : storage.m_listeners)
handle->m_fn(args...);
}

private:
static void Remove(HookImpl* handle)
{
std::lock_guard lock(m_mutex);

std::erase(m_listeners, handle);
}

inline static std::vector<HookImpl*> m_listeners = {};
inline static std::mutex m_mutex;
};

} // namespace Common