Skip to content

Use 'equal_range' instead of full scan for rule exceptions #2370

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Use 'equal_range' instead of full scan for rule exceptions #2370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 19 additions & 37 deletions src/rule_with_actions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,9 @@ void RuleWithActions::executeActionsIndependentOfChainedRuleResult(Transaction *
a->evaluate(this, trans);
}

for (auto &b :
trans->m_rules->m_exceptions.m_action_pre_update_target_by_id) {
if (m_ruleId != b.first) {
continue;
}
actions::Action *a = dynamic_cast<actions::Action*>(b.second.get());
auto range = trans->m_rules->m_exceptions.m_action_pre_update_target_by_id.equal_range(m_ruleId);
for (auto it = range.first; it != range.second; ++it) {
actions::Action *a = it->second.get();
if (a->isDisruptive() == true && *a->m_name.get() == "block") {
ms_dbg_a(trans, 9, "Rule contains a `block' action");
*containsBlock = true;
Expand Down Expand Up @@ -248,12 +245,10 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans,
a->evaluate(this, trans, ruleMessage);
}

for (auto &b :
trans->m_rules->m_exceptions.m_action_pos_update_target_by_id) {
if (m_ruleId != b.first) {
continue;
}
actions::Action *a = dynamic_cast<actions::Action*>(b.second.get());

auto range = trans->m_rules->m_exceptions.m_action_pos_update_target_by_id.equal_range(m_ruleId);
for (auto it = range.first; it != range.second; ++it) {
actions::Action *a = it->second.get();
executeAction(trans, containsBlock, ruleMessage, a, false);
disruptiveAlreadyExecuted = true;
}
Expand Down Expand Up @@ -382,23 +377,15 @@ void RuleWithActions::executeTransformations(

// FIXME: It can't be something different from transformation. Sort this
// on rules compile time.
for (auto &b :
trans->m_rules->m_exceptions.m_action_pre_update_target_by_id) {
if (m_ruleId != b.first) {
continue;
}
Transformation *a = dynamic_cast<Transformation*>(b.second.get());
auto range = trans->m_rules->m_exceptions.m_action_pre_update_target_by_id.equal_range(m_ruleId);
for (auto it = range.first; it != range.second; ++it) {
Transformation *a = dynamic_cast<Transformation*>(it->second.get());
if (a->m_isNone) {
none++;
}
}

for (auto &b :
trans->m_rules->m_exceptions.m_action_pre_update_target_by_id) {
if (m_ruleId != b.first) {
continue;
}
Transformation *a = dynamic_cast<Transformation*>(b.second.get());
for (auto it = range.first; it != range.second; ++it) {
Transformation *a = dynamic_cast<Transformation*>(it->second.get());
if (none == 0) {
Transformation *t = dynamic_cast<Transformation *>(a);
executeTransformation(t, &value, trans, &ret, &path,
Expand Down Expand Up @@ -451,22 +438,17 @@ std::vector<actions::Action *> RuleWithActions::getActionsByName(const std::stri
ret.push_back(z);
}
}
for (auto &b :
trans->m_rules->m_exceptions.m_action_pre_update_target_by_id) {
if (m_ruleId != b.first) {
continue;
}
actions::Action *z = dynamic_cast<actions::Action*>(b.second.get());

auto range = trans->m_rules->m_exceptions.m_action_pre_update_target_by_id.equal_range(m_ruleId);
for (auto it = range.first; it != range.second; ++it) {
actions::Action *z = it->second.get();
if (*z->m_name.get() == name) {
ret.push_back(z);
}
}
for (auto &b :
trans->m_rules->m_exceptions.m_action_pos_update_target_by_id) {
if (m_ruleId != b.first) {
continue;
}
actions::Action *z = dynamic_cast<actions::Action*>(b.second.get());
range = trans->m_rules->m_exceptions.m_action_pos_update_target_by_id.equal_range(m_ruleId);
for (auto it = range.first; it != range.second; ++it) {
actions::Action *z = it->second.get();
if (*z->m_name.get() == name) {
ret.push_back(z);
}
Expand Down