github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use GCD to perform concurrent rule matching

Browse Source
This commit is contained in:
Allan Odgaard
2013-08-17 21:36:11 +02:00
parent 3ae9bfe7b8
commit ee43777c3a
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Frameworks/parse/src/parse.cc
View File

@@ -322,25 +322,38 @@ namespace parse
// = Match rules against text =
// ============================
size_t rank = 0;
for(rule_ptr const& rule : rules)
std::vector<std::pair<rule_ptr, size_t>> v;
for(size_t j = 0; j < rules.size(); ++j)
{
D(DBF_Parser, bug("rule id %zu, pattern %s\n", rule->rule_id, to_s(rule->match_pattern).c_str()););
std::map<size_t, regexp::match_t>::iterator it = match_cache.find(rule->rule_id);
std::map<size_t, regexp::match_t>::iterator it = match_cache.find(rules[j]->rule_id);
if(it != match_cache.end())
{
if(it->second)
res.insert((ranked_match_t){ rule, it->second, ++rank });
res.insert((ranked_match_t){ rules[j], it->second, j+1 });
}
else
{
regexp::match_t const& match = regexp::search(fix_anchor(rule->match_pattern, stack->anchor, i, firstLine), first, last, first + i);
if(!pattern_is_anchored(to_s(rule->match_pattern)))
match_cache.insert(std::make_pair(rule->rule_id, match));
if(match)
res.insert((ranked_match_t){ rule, match, ++rank });
v.emplace_back(rules[j], j+1);
}
}
__block std::vector<regexp::match_t> matches(v.size());
size_t anchor = stack->anchor;
size_t const stride = 5;
dispatch_apply(matches.size() / stride, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(size_t n){
for(size_t j = n*stride; j < (n+1)*stride; ++j)
matches[j] = regexp::search(fix_anchor(v[j].first->match_pattern, anchor, i, firstLine), first, last, first + i);
});
for(size_t j = matches.size() - (matches.size() % stride); j < matches.size(); ++j)
matches[j] = regexp::search(fix_anchor(v[j].first->match_pattern, anchor, i, firstLine), first, last, first + i);
for(size_t j = 0; j < matches.size(); ++j)
{
if(!pattern_is_anchored(to_s(v[j].first->match_pattern)))
match_cache.insert(std::make_pair(v[j].first->rule_id, matches[j]));
if(matches[j])
res.insert((ranked_match_t){ v[j].first, matches[j], v[j].second });
}
}
static bool has_cycle (size_t rule_id, size_t i, stack_ptr const& stack)