xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a vector instead of a hash map to store hooks

Browse Source
This commit is contained in:
Maxime Coste 2017-06-07 09:34:07 +01:00
parent fd00e1f9ae
commit a5e7b6a22f
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hook_manager.cc
View File

@ -12,18 +12,20 @@
namespace Kakoune namespace Kakoune
{ {
void HookManager::add_hook(StringView hook_name, String group, HookFunc hook) void HookManager::add_hook(StringView hook_name, String group, HookFunc func)
{ {
auto& hooks = m_hooks[hook_name]; auto& hooks = m_hooks[hook_name];
hooks.insert({std::move(group), std::move(hook)}); hooks.push_back({std::move(group), std::move(func)});
} }
void HookManager::remove_hooks(StringView group) void HookManager::remove_hooks(StringView group)
{ {
if (group.empty()) if (group.empty())
throw runtime_error("invalid id"); throw runtime_error("invalid id");
for (auto& hooks : m_hooks) for (auto& list : m_hooks)
hooks.value.remove_all(group); list.value.erase(std::remove_if(list.value.begin(), list.value.end(),
[&](const Hook& h) { return h.group == group; }),
list.value.end());
} }
CandidateList HookManager::complete_hook_group(StringView prefix, ByteCount pos_in_token) CandidateList HookManager::complete_hook_group(StringView prefix, ByteCount pos_in_token)
@ -31,7 +33,7 @@ CandidateList HookManager::complete_hook_group(StringView prefix, ByteCount pos_
CandidateList res; CandidateList res;
for (auto& list : m_hooks) for (auto& list : m_hooks)
{ {
auto container = list.value | transform(std::mem_fn(&decltype(list.value)::Item::key)); auto container = list.value | transform(std::mem_fn(&decltype(list.value)::value_type::group));
for (auto& c : complete(prefix, pos_in_token, container)) for (auto& c : complete(prefix, pos_in_token, container))
{ {
if (!contains(res, c)) if (!contains(res, c))
@ -69,12 +71,12 @@ void HookManager::run_hook(StringView hook_name,
auto start_time = profile ? Clock::now() : TimePoint{}; auto start_time = profile ? Clock::now() : TimePoint{};
auto& disabled_hooks = context.options()["disabled_hooks"].get<Regex>(); auto& disabled_hooks = context.options()["disabled_hooks"].get<Regex>();
Vector<std::pair<String, HookFunc>> hooks_to_run; Vector<Hook> hooks_to_run;
for (auto& hook : hook_list_it->value) for (auto& hook : hook_list_it->value)
{ {
if (hook.key.empty() or disabled_hooks.empty() or if (hook.group.empty() or disabled_hooks.empty() or
not regex_match(hook.key.begin(), hook.key.end(), disabled_hooks)) not regex_match(hook.group.begin(), hook.group.end(), disabled_hooks))
hooks_to_run.push_back({hook.key, hook.value}); hooks_to_run.push_back(hook);
} }
bool hook_error = false; bool hook_error = false;
@ -83,14 +85,14 @@ void HookManager::run_hook(StringView hook_name,
try try
{ {
if (debug_flags & DebugFlags::Hooks) if (debug_flags & DebugFlags::Hooks)
write_to_debug_buffer(format("hook {}/{}", hook_name, hook.first)); write_to_debug_buffer(format("hook {}({})/{}", hook_name, param, hook.group));
hook.second(param, context); hook.func(param, context);
} }
catch (runtime_error& err) catch (runtime_error& err)
{ {
hook_error = true; hook_error = true;
write_to_debug_buffer(format("error running hook {}({})/{}: {}", write_to_debug_buffer(format("error running hook {}({})/{}: {}",
hook_name, param, hook.first, err.what())); hook_name, param, hook.group, err.what()));
} }
} }

10
src/hook_manager.hh
View File

@ -16,7 +16,7 @@ class HookManager : public SafeCountable
public: public:
HookManager(HookManager& parent) : m_parent(&parent) {} HookManager(HookManager& parent) : m_parent(&parent) {}
void add_hook(StringView hook_name, String group, HookFunc hook); void add_hook(StringView hook_name, String group, HookFunc func);
void remove_hooks(StringView group); void remove_hooks(StringView group);
CandidateList complete_hook_group(StringView prefix, ByteCount pos_in_token); CandidateList complete_hook_group(StringView prefix, ByteCount pos_in_token);
void run_hook(StringView hook_name, StringView param, void run_hook(StringView hook_name, StringView param,
@ -28,8 +28,14 @@ private:
// the only one allowed to construct a root hook manager // the only one allowed to construct a root hook manager
friend class Scope; friend class Scope;
struct Hook
{
String group;
HookFunc func;
};
SafePtr<HookManager> m_parent; SafePtr<HookManager> m_parent;
HashMap<String, HashMap<String, HookFunc, MemoryDomain::Hooks>, MemoryDomain::Hooks> m_hooks; HashMap<String, Vector<Hook, MemoryDomain::Hooks>, MemoryDomain::Hooks> m_hooks;
mutable Vector<std::pair<StringView, StringView>, MemoryDomain::Hooks> m_running_hooks; mutable Vector<std::pair<StringView, StringView>, MemoryDomain::Hooks> m_running_hooks;
}; };