github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-07-13 05:54:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gatherReports: fewer map lookups

Browse Source
This commit is contained in:
Justin Viiret 2017-08-10 11:48:50 +10:00 committed by Matthew Barr
parent ba6f638c40
commit d5b3f2b508
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nfa/mcclellancompile.cpp
View File

@ -288,11 +288,12 @@ unique_ptr<raw_report_info> mcclellan_build_strat::gatherReports(
raw_report_list rrl(s.reports, rm, remap_reports); raw_report_list rrl(s.reports, rm, remap_reports);
DEBUG_PRINTF("non empty r\n"); DEBUG_PRINTF("non empty r\n");
if (rev.find(rrl) != rev.end()) { auto it = rev.find(rrl);
reports.push_back(rev[rrl]); if (it != rev.end()) {
reports.push_back(it->second);
} else { } else {
DEBUG_PRINTF("adding to rl %zu\n", ri->size()); DEBUG_PRINTF("adding to rl %zu\n", ri->size());
rev[rrl] = ri->size(); rev.emplace(rrl, ri->size());
reports.push_back(ri->size()); reports.push_back(ri->size());
ri->rl.push_back(rrl); ri->rl.push_back(rrl);
} }
@ -306,13 +307,14 @@ unique_ptr<raw_report_info> mcclellan_build_strat::gatherReports(
DEBUG_PRINTF("non empty r eod\n"); DEBUG_PRINTF("non empty r eod\n");
raw_report_list rrl(s.reports_eod, rm, remap_reports); raw_report_list rrl(s.reports_eod, rm, remap_reports);
if (rev.find(rrl) != rev.end()) { auto it = rev.find(rrl);
reports_eod.push_back(rev[rrl]); if (it != rev.end()) {
reports_eod.push_back(it->second);
continue; continue;
} }
DEBUG_PRINTF("adding to rl eod %zu\n", s.reports_eod.size()); DEBUG_PRINTF("adding to rl eod %zu\n", s.reports_eod.size());
rev[rrl] = ri->size(); rev.emplace(rrl, ri->size());
reports_eod.push_back(ri->size()); reports_eod.push_back(ri->size());
ri->rl.push_back(rrl); ri->rl.push_back(rrl);
} }
@ -325,10 +327,9 @@ unique_ptr<raw_report_info> mcclellan_build_strat::gatherReports(
*arbReport = 0; *arbReport = 0;
} }
/* if we have only a single report id generated from all accepts (not eod) /* if we have only a single report id generated from all accepts (not eod)
* we can take some short cuts */ * we can take some short cuts */
set<ReportID> reps; flat_set<ReportID> reps;
for (u32 rl_index : reports) { for (u32 rl_index : reports) {
if (rl_index == MO_INVALID_IDX) { if (rl_index == MO_INVALID_IDX) {